December 2006 - crux-commits

ports/core (2.3): ppp: fixed source URL
by crux＠crux.nu 03 Dec '06

03 Dec '06

commit c0512742a878884dd94d76131638f9fa9a45ad9a Author: Juergen Daubert <jue(a)jue.li> Date: Sun Dec 3 12:57:22 2006 +0100 ppp: fixed source URL diff --git a/ppp/Pkgfile b/ppp/Pkgfile index fcf717e..03fac37 100644 --- a/ppp/Pkgfile +++ b/ppp/Pkgfile @@ -6,7 +6,7 @@ name=ppp version=2.4.4 release=1 -source=(ftp://ftp.samba.org/pub/ppp/$name-$version.tar.gz \ +source=(http://ppp.samba.org/ftp/ppp/$name-$version.tar.gz \ $name-nofilter.patch \ $name-makefile.patch)

1 0

ports/core (2.3): Merge branch '2.2' into 2.3
by crux＠crux.nu 03 Dec '06

03 Dec '06

commit deaa90d671a4dbe12369e2cf38ee8e7a7e391240 Merge: 60f4af3... c051274... Author: Juergen Daubert <jue(a)jue.li> Date: Sun Dec 3 12:58:46 2006 +0100 Merge branch '2.2' into 2.3

1 0

ports/core (2.2): ppp: fixed source URL
by crux＠crux.nu 03 Dec '06

03 Dec '06

commit c0512742a878884dd94d76131638f9fa9a45ad9a Author: Juergen Daubert <jue(a)jue.li> Date: Sun Dec 3 12:57:22 2006 +0100 ppp: fixed source URL diff --git a/ppp/Pkgfile b/ppp/Pkgfile index fcf717e..03fac37 100644 --- a/ppp/Pkgfile +++ b/ppp/Pkgfile @@ -6,7 +6,7 @@ name=ppp version=2.4.4 release=1 -source=(ftp://ftp.samba.org/pub/ppp/$name-$version.tar.gz \ +source=(http://ppp.samba.org/ftp/ppp/$name-$version.tar.gz \ $name-nofilter.patch \ $name-makefile.patch)

1 0

ports/opt (2.3): mathopd: added mime-types to config, updated dir_cgi, run as user www
by crux＠crux.nu 03 Dec '06

03 Dec '06

commit 1562da7b94fa7efc6e74f4836e3066064a91e83b Author: Juergen Daubert <jue(a)jue.li> Date: Sun Dec 3 12:18:51 2006 +0100 mathopd: added mime-types to config, updated dir_cgi, run as user www diff --git a/mathopd/.footprint b/mathopd/.footprint index 8275009..02a06f3 100644 --- a/mathopd/.footprint +++ b/mathopd/.footprint @@ -14,4 +14,4 @@ drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/mathopd drwxr-xr-x root/root var/ drwxr-xr-x root/root var/log/ -drwxr-xr-x nobody/nobody var/log/mathopd/ +drwxr-xr-x www/www var/log/mathopd/ diff --git a/mathopd/.md5sum b/mathopd/.md5sum index 5f4e725..a01ef94 100644 --- a/mathopd/.md5sum +++ b/mathopd/.md5sum @@ -1,6 +1,6 @@ -b4ecc5add36612eac64ac6ce3e442a15 dir_cgi-1.0.tar.gz +ec0d71c0c75986c1c4974320788945cc dir_cgi-1.1.tar.gz 56ed28d0c582903a2c29c9c5f9153e57 mathopd 48b54bf1e9673203a8f18a4fefab4730 mathopd-1.5p5.tar.gz dd645079a41380fbb301da6d5559de84 mathopd.8.gz -8f99818844ecd34a24ddef955cd7f140 mathopd.conf +2f0f28b786a555bbd800c0cbcf0d7057 mathopd.conf 30b3213864d035989dacd1d256880e81 mathopd.conf.5.gz diff --git a/mathopd/Pkgfile b/mathopd/Pkgfile index 8a680da..ebf98c1 100644 --- a/mathopd/Pkgfile +++ b/mathopd/Pkgfile @@ -4,9 +4,9 @@ name=mathopd version=1.5p5 -release=2 +release=3 source=(http://www.mathopd.org/dist/$name-$version.tar.gz \ - http://jue.li/misc/dir_cgi/dir_cgi-1.0.tar.gz \ + http://jue.li/misc/dir_cgi/dir_cgi-1.1.tar.gz \ http://www.mathopd.org/doc/mathopd.8.gz \ http://www.mathopd.org/doc/mathopd.conf.5.gz \ mathopd.conf mathopd) @@ -22,8 +22,8 @@ build () { install -m 755 $SRC/mathopd $PKG/etc/rc.d install -m 644 $SRC/mathopd.8.gz $PKG/usr/man/man8 install -m 644 $SRC/mathopd.conf.5.gz $PKG/usr/man/man5 - install -d -o nobody -g nobody $PKG/var/log/mathopd + install -d -o www -g www $PKG/var/log/mathopd - cd $SRC/dir_cgi-1.0 + cd $SRC/dir_cgi-1.1 make DESTDIR=$PKG install } diff --git a/mathopd/mathopd.conf b/mathopd/mathopd.conf index f7f0856..93d6e86 100644 --- a/mathopd/mathopd.conf +++ b/mathopd/mathopd.conf @@ -2,7 +2,7 @@ # /etc/mathopd.conf # -User nobody +User www LogGMT On Log /var/log/mathopd/%Y%m%d.log ErrorLog /var/log/mathopd/errorlog @@ -34,16 +34,85 @@ Control { ChildLog /var/log/mathopd/childlog Types { - text/html { html } - image/gif { gif } - image/jpeg { jpg jpeg } - text/css { css } + application/andrew-inset { .ez } + application/excel { .xls } + application/oda { .oda } + application/pdf { .pdf } + application/pgp { .pgp } + application/postscript { .ps .PS .eps } + application/rtf { .rtf } + application/x-arj-compressed { .arj } + application/x-bcpio { .bcpio } + application/x-chess-pgn { .pgn } + application/x-cpio { .cpio } + application/x-csh { .csh } + application/x-debian-package { .deb } + application/x-msdos-program { .com .exe .bat } + application/x-dvi { .dvi } + application/x-gtar { .gtar } + application/x-gunzip { .gz } + application/x-hdf { .hdf } + application/x-latex { .latex } + application/x-mif { .mif } + application/x-netcdf { .cdf .nc } + application/x-perl { .pl .pm } + application/x-rar-compressed { .rar } + application/x-sh { .sh } + application/x-shar { .shar } + application/x-sv4cpio { .sv4cpio } + application/x-sv4crc { .sv4crc } + application/x-tar { .tar } + application/x-tar-gz { .tgz .tar.gz } + application/x-tcl { .tcl } + application/x-tex { .tex } + application/x-texinfo { .texi .texinfo } + application/x-troff { .t .tr .roff } + application/x-troff-man { .man } + application/x-troff-me { .me } + application/x-troff-ms { .ms } + application/x-ustar { .ustar } + application/x-wais-source { .src } + application/x-zip-compressed { .zip } + audio/basic { .snd } + audio/midi { .mid .midi } + audio/ulaw { .au } + audio/x-aiff { .aif .aifc .aiff } + audio/x-wav { .wav } + image/gif { .gif } + image/ief { .ief } + image/jpeg { .jpe .jpeg .jpg } + image/png { .png } + image/tiff { .tif .tiff } + image/x-cmu-raster { .ras } + image/x-portable-anymap { .pnm } + image/x-portable-bitmap { .pbm } + image/x-portable-graymap { .pgm } + image/x-portable-pixmap { .ppm } + image/x-rgb { .rgb } + image/x-xbitmap { .xbm } + image/x-xpixmap { .xpm } + image/x-xwindowdump { .xwd } + text/html { .html .htm } + text/plain { .asc .txt } + text/css { .css } + text/richtext { .rtx } + text/tab-separated-values { .tsv } + text/x-setext { .etx } + video/dl { .dl } + video/fli { .fli } + video/gl { .gl } + video/mpeg { .mp2 .mpe .mpeg .mpg } + video/quicktime { .mov .qt } + video/x-msvideo { .avi } + video/x-sgi-movie { .movie } + x-world/x-vrml { .vrm .vrml .wrl } + application/octet-stream { * } } - + # External { -# /usr/bin/php { php } -# /usr/bin/eruby { rhtml } +# /usr/bin/php { php } +# /usr/bin/eruby { rhtml } # } IndexNames { index.html index.htm } @@ -56,7 +125,7 @@ Server { Virtual { AnyHost - + Control { Alias / Location /var/www

1 0

ports/opt (2.3): grub: moved to core again
by crux＠crux.nu 03 Dec '06

03 Dec '06

commit d7045081fe5336362dbfe594b30459f1a319dc9d Author: Juergen Daubert <jue(a)jue.li> Date: Sun Dec 3 12:06:40 2006 +0100 grub: moved to core again diff --git a/grub/.footprint b/grub/.footprint deleted file mode 100644 index 1a40213..0000000 --- a/grub/.footprint +++ /dev/null @@ -1,37 +0,0 @@ -drwxr-xr-x root/root boot/ -drwxr-xr-x root/root boot/grub/ --rw-r--r-- root/root boot/grub/crux02.xpm.gz --rw-r--r-- root/root boot/grub/crux03.xpm.gz --rw-r--r-- root/root boot/grub/menu.lst.sample -drwxr-xr-x root/root sbin/ --rwxr-xr-x root/root sbin/grub --rwxr-xr-x root/root sbin/grub-install --rwxr-xr-x root/root sbin/grub-md5-crypt --rwxr-xr-x root/root sbin/grub-terminfo -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/bin/ --rwxr-xr-x root/root usr/bin/mbchk -drwxr-xr-x root/root usr/man/ -drwxr-xr-x root/root usr/man/man1/ --rw-r--r-- root/root usr/man/man1/mbchk.1.gz -drwxr-xr-x root/root usr/man/man8/ --rw-r--r-- root/root usr/man/man8/grub-install.8.gz --rw-r--r-- root/root usr/man/man8/grub-md5-crypt.8.gz --rw-r--r-- root/root usr/man/man8/grub-terminfo.8.gz --rw-r--r-- root/root usr/man/man8/grub.8.gz -drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/grub/ -drwxr-xr-x root/root usr/share/grub/i386-pc/ --rw-r--r-- root/root usr/share/grub/i386-pc/e2fs_stage1_5 --rw-r--r-- root/root usr/share/grub/i386-pc/fat_stage1_5 --rw-r--r-- root/root usr/share/grub/i386-pc/ffs_stage1_5 --rw-r--r-- root/root usr/share/grub/i386-pc/iso9660_stage1_5 --rw-r--r-- root/root usr/share/grub/i386-pc/jfs_stage1_5 --rw-r--r-- root/root usr/share/grub/i386-pc/minix_stage1_5 --rw-r--r-- root/root usr/share/grub/i386-pc/reiserfs_stage1_5 --rw-r--r-- root/root usr/share/grub/i386-pc/stage1 --rw-r--r-- root/root usr/share/grub/i386-pc/stage2 --rw-r--r-- root/root usr/share/grub/i386-pc/stage2_eltorito --rw-r--r-- root/root usr/share/grub/i386-pc/ufs2_stage1_5 --rw-r--r-- root/root usr/share/grub/i386-pc/vstafs_stage1_5 --rw-r--r-- root/root usr/share/grub/i386-pc/xfs_stage1_5 diff --git a/grub/.md5sum b/grub/.md5sum deleted file mode 100644 index 7c3d581..0000000 --- a/grub/.md5sum +++ /dev/null @@ -1,5 +0,0 @@ -571ab75bb9f4c247853d93264eda1df4 crux02.xpm.gz -55e343038043e16df5293d63782373d0 crux03.xpm.gz -a74fc336016eca6e22af7158df8433c9 grub-0.95-patches.tar.gz -4ca8e4363d5f1980f2c63b7f5cdbe0d1 grub-0.95.tar.gz -1f2733522ab27183e3830d93733141ac menu.lst.sample diff --git a/grub/Pkgfile b/grub/Pkgfile deleted file mode 100644 index c9a4455..0000000 --- a/grub/Pkgfile +++ /dev/null @@ -1,76 +0,0 @@ -# Description: GNU GRUB (GRand Unified Bootloader) -# URL: http://www.gnu.org/software/grub/ -# Packager: Daniel Müller, daniel at danm dot de -# Maintainer: Matt Housh, jaeger at morpheus dot net -# Depends on: ncurses, gettext - -name=grub -version=0.95 -release=5 -source=(ftp://alpha.gnu.org/gnu/grub/$name-$version.tar.gz \ - http://crux.nu/files/grub/$version/$name-$version-patches.tar.gz \ - http://crux.nu/files/grub/$version/crux02.xpm.gz \ - http://crux.nu/files/grub/$version/crux03.xpm.gz \ - menu.lst.sample) - -build () { - cd $name-$version - - # Apply Fedora Linux patches - PATCH_LIST=( - 0.90-symlinkmenulst - 0.90-install.in - 0.94-installcopyonly - 0.94-addsyncs - 0.95-endedit - 0.90-append - 0.93-once - 0.95-graphics - 0.91-splashimagehelp - 0.93-graphics-bootterm - 0.95-hiddenmenu-tweak - 0.95-ext2-sparse - 0.93-special-device-names - 0.94-initrdmax - 0.94-i2o - 0.95-staticcurses - 0.95-moreraid - 0.95-odirect - 0.95-geometry-26kernel - 0.95-md - 0.95-md-rework - 0.95-xpmjunk - 0.95-splash-error-term - 0.95-nxstack - 0.95-mdadm-path - 0.95-md-mbr - 0.95-gcc4 - 0.95-nonmbr - ) - - for PATCH in ${PATCH_LIST[@]} - do - patch -p1 -i $SRC/$name-patches/$name-$PATCH.patch - done - - # http://lists.gnu.org/archive/html/bug-grub/2005-04/msg00031.html - patch -p0 -i $SRC/$name-patches/$name-$version-xfs-writable-strings.patch - - unset CXXFLAGS - export CFLAGS="-Os" - - autoreconf --install --force - - ./configure --prefix=/usr \ - --mandir=/usr/man \ - --sbindir=/sbin \ - --disable-nls \ - --disable-auto-linux-mem-opt - - make - make DESTDIR=$PKG install - rm -rf $PKG/usr/share/info - - mkdir -p $PKG/boot/grub - install -m 644 $SRC/{crux*,menu.lst.sample} $PKG/boot/grub/ -} diff --git a/grub/README b/grub/README deleted file mode 100644 index 2027d2f..0000000 --- a/grub/README +++ /dev/null @@ -1,51 +0,0 @@ - -REQUIREMENTS - -PRE-INSTALL - -POST-INSTALL - - After installation you need to copy the stage files to - /boot/grub/: - - # cp /usr/share/grub/i386-pc/* /boot/grub/ - - (Of course, you can choose another location as described above but - this guide assumes that you use /boot/grub. Normally you need only - the files stage1 and stage2 - please read the grub documentation if - you don't know why. http://www.uruk.org/orig-grub/ and - http://www.gnu.org/software/grub/manual/grub.html) - - Now it's time to create your own "boot menu": - - # # Copy sample file - # cp /boot/grub/menu.lst.sample /boot/grub/menu.lst - # # Modify it for your system - # vi /boot/grub/menu.lst - - For more information about setting up your own grub boot menu file: - http://www.gnu.org/manual/grub-0.92/html_mono/grub.html#Configuration - - Last but not least - install/enable the bootmanager: - # # Run grub - # grub - grub> root (hdX,Y) - grub> setup (hdX) - grub> quit - - Please correct the path & device names according your configuration. - Also see http://www.gnu.org/software/grub/manual/grub.html#Installation. - In the example above, X and Y need to be replaced with your hard drive - and grub partition. - - That's all. Good luck ;) - -PRECAUTION - - Installing a new boot manager is like modifiying the partition table - using fdisk - or installing a new system kernel. Please create a rescue - boot disk first :) - This is a heavy patched version of grub - Use it on your own risk ! - -Matt Housh <jaeger(a)crux.nu> - diff --git a/grub/crux02.xpm.gz b/grub/crux02.xpm.gz deleted file mode 100644 index e62bf31..0000000 Binary files a/grub/crux02.xpm.gz and /dev/null differ diff --git a/grub/crux03.xpm.gz b/grub/crux03.xpm.gz deleted file mode 100644 index 72961da..0000000 Binary files a/grub/crux03.xpm.gz and /dev/null differ diff --git a/grub/menu.lst.sample b/grub/menu.lst.sample deleted file mode 100644 index 5a066ab..0000000 --- a/grub/menu.lst.sample +++ /dev/null @@ -1,64 +0,0 @@ -### Global settings - -## CRUX splash image -splashimage (hd0,0)/boot/grub/crux03.xpm.gz -## define special fore-/background colors for splash screen image -foreground = FFFFFF -background = AAAAAA - -## shaded text -#shade 1 - -## time to wait for user interaction -timeout 5 - -## default boot kernel -default 0 - -### GRUB Devices: -## -## Linux Grub -## ====================== -## /dev/hda (hd0) -## /dev/hda1 (hd0,0) -## /dev/hdb (hd1) -## /dev/hdb1 (hd1,0) -## /dev/fd0 (fd0) - -### Remember: -## The Linux kernel 2.4.19 has a bug which prevents using of devfs -## device names (/dev/disc/disc0/part1,..). CRUX 0.9.4 comes with -## 2.4.19 ! - -## Default menu entries - -title CRUX -kernel (hd0,0)/boot/vmlinuz root=/dev/hda1 - -title CRUX -kernel (hd0,0)/boot/vmlinuz.old root=/dev/hda1 - -### Special cases - -## Boot special bootimage -#title Memtest -#kernel (hd0,0)/boot/memtest.bin - -## Boot Microsoft Windows(TM) -#title Windows -#root (hd0,5) -#makeactive -#chainloader +1 - -## Boot from Floppy -#title floppy -#root (fd0) -#chainloader +1 - -## Boot with different /boot partition -## / = /dev/hdb2 = (hd1,1) -## /boot = /dev/hdb1 = (hd1,0) -## -#title CRUX GNU/Linux drive 2 -#kernel (hd1,0)/vmlinuz root=/dev/hdb2 -

1 0

ports/core (2.3): grub: readded to core
by crux＠crux.nu 03 Dec '06

03 Dec '06

commit 60f4af3edf30800044aab16a594c172636cbb7b6 Merge: 2e8e2c1... d7e800c... Author: Juergen Daubert <jue(a)jue.li> Date: Sun Dec 3 12:03:15 2006 +0100 grub: readded to core

1 0

ports/core (2.3): man-pages: update to 2.43
by crux＠crux.nu 03 Dec '06

03 Dec '06

commit 9ae708997ce38b580d2b0151b5a7ee2be4335d55 Author: Juergen Daubert <jue(a)jue.li> Date: Fri Dec 1 10:45:52 2006 +0100 man-pages: update to 2.43 diff --git a/man-pages/.md5sum b/man-pages/.md5sum index 7652b78..9375917 100644 --- a/man-pages/.md5sum +++ b/man-pages/.md5sum @@ -1 +1 @@ -9e9ca369c2686014eba5db9cf05cb264 man-pages-2.42.tar.gz +8023a498fe2650256e6bd797b932e1af man-pages-2.43.tar.gz diff --git a/man-pages/Pkgfile b/man-pages/Pkgfile index ef4ef86..e590e3e 100644 --- a/man-pages/Pkgfile +++ b/man-pages/Pkgfile @@ -4,7 +4,7 @@ # Depends on: man name=man-pages -version=2.42 +version=2.43 release=1 source=(ftp://ftp.win.tue.nl/pub/linux-local/manpages/$name-$version.tar.gz)

1 0

ports/core (2.3): rsync: fixed source URL
by crux＠crux.nu 03 Dec '06

03 Dec '06

commit d7e800c076881971c682d45b7b9429799ddd4352 Author: Juergen Daubert <jue(a)jue.li> Date: Sun Dec 3 11:29:01 2006 +0100 rsync: fixed source URL diff --git a/rsync/Pkgfile b/rsync/Pkgfile index 21bda6d..5bac4bd 100644 --- a/rsync/Pkgfile +++ b/rsync/Pkgfile @@ -6,7 +6,7 @@ name=rsync version=2.6.9 release=1 -source=(http://samba.org/ftp/$name/$name-$version.tar.gz \ +source=(http://rsync.samba.org/ftp/$name/$name-$version.tar.gz \ rsyncd.conf rsyncd rsync.driver) build () {

1 0

ports/core (2.3): grub: removed old menu.lst.sample
by crux＠crux.nu 03 Dec '06

03 Dec '06

commit 6eac39d07e3c4b4be49c5465707d6dc7201f8e53 Author: Matt Housh <jaeger(a)crux.nu> Date: Thu Nov 30 09:34:25 2006 -0600 grub: removed old menu.lst.sample diff --git a/grub/menu.lst.sample b/grub/menu.lst.sample deleted file mode 100644 index 5a066ab..0000000 --- a/grub/menu.lst.sample +++ /dev/null @@ -1,64 +0,0 @@ -### Global settings - -## CRUX splash image -splashimage (hd0,0)/boot/grub/crux03.xpm.gz -## define special fore-/background colors for splash screen image -foreground = FFFFFF -background = AAAAAA - -## shaded text -#shade 1 - -## time to wait for user interaction -timeout 5 - -## default boot kernel -default 0 - -### GRUB Devices: -## -## Linux Grub -## ====================== -## /dev/hda (hd0) -## /dev/hda1 (hd0,0) -## /dev/hdb (hd1) -## /dev/hdb1 (hd1,0) -## /dev/fd0 (fd0) - -### Remember: -## The Linux kernel 2.4.19 has a bug which prevents using of devfs -## device names (/dev/disc/disc0/part1,..). CRUX 0.9.4 comes with -## 2.4.19 ! - -## Default menu entries - -title CRUX -kernel (hd0,0)/boot/vmlinuz root=/dev/hda1 - -title CRUX -kernel (hd0,0)/boot/vmlinuz.old root=/dev/hda1 - -### Special cases - -## Boot special bootimage -#title Memtest -#kernel (hd0,0)/boot/memtest.bin - -## Boot Microsoft Windows(TM) -#title Windows -#root (hd0,5) -#makeactive -#chainloader +1 - -## Boot from Floppy -#title floppy -#root (fd0) -#chainloader +1 - -## Boot with different /boot partition -## / = /dev/hdb2 = (hd1,1) -## /boot = /dev/hdb1 = (hd1,0) -## -#title CRUX GNU/Linux drive 2 -#kernel (hd1,0)/vmlinuz root=/dev/hdb2 -

1 0

ports/core (2.3): grub: menu.lst renamed to grub.conf, updated README and aesthetic fixups
by crux＠crux.nu 03 Dec '06

03 Dec '06

commit a4e462fda8b1f117405bfb49165466529dd0256c Author: Matt Housh <jaeger(a)crux.nu> Date: Thu Nov 30 09:27:16 2006 -0600 grub: menu.lst renamed to grub.conf, updated README and aesthetic fixups diff --git a/grub/.footprint b/grub/.footprint index 1a40213..b6da109 100644 --- a/grub/.footprint +++ b/grub/.footprint @@ -2,7 +2,7 @@ drwxr-xr-x root/root boot/ drwxr-xr-x root/root boot/grub/ -rw-r--r-- root/root boot/grub/crux02.xpm.gz -rw-r--r-- root/root boot/grub/crux03.xpm.gz --rw-r--r-- root/root boot/grub/menu.lst.sample +-rw-r--r-- root/root boot/grub/grub.conf.sample drwxr-xr-x root/root sbin/ -rwxr-xr-x root/root sbin/grub -rwxr-xr-x root/root sbin/grub-install diff --git a/grub/.md5sum b/grub/.md5sum index eb52e38..2d994f6 100644 --- a/grub/.md5sum +++ b/grub/.md5sum @@ -2,4 +2,4 @@ 55e343038043e16df5293d63782373d0 crux03.xpm.gz e0fce491c713805650df3d8962ead526 grub-0.97-patches.tar.gz cd3f3eb54446be6003156158d51f4884 grub-0.97.tar.gz -1f2733522ab27183e3830d93733141ac menu.lst.sample +1f2733522ab27183e3830d93733141ac grub.conf.sample diff --git a/grub/Pkgfile b/grub/Pkgfile index 07f9a4c..297c3bb 100644 --- a/grub/Pkgfile +++ b/grub/Pkgfile @@ -6,12 +6,12 @@ name=grub version=0.97 -release=1 +release=2 source=(ftp://alpha.gnu.org/gnu/grub/$name-$version.tar.gz \ http://crux.nu/files/grub/$version/$name-$version-patches.tar.gz \ http://crux.nu/files/grub/common/crux02.xpm.gz \ http://crux.nu/files/grub/common/crux03.xpm.gz \ - menu.lst.sample) + grub.conf.sample) build () { cd $name-$version @@ -82,5 +82,5 @@ build () { rm -rf $PKG/usr/share/info mkdir -p $PKG/boot/grub - install -m 644 $SRC/{crux*,menu.lst.sample} $PKG/boot/grub/ + install -m 644 $SRC/{crux*,grub.conf.sample} $PKG/boot/grub/ } diff --git a/grub/README b/grub/README index 2027d2f..411bd61 100644 --- a/grub/README +++ b/grub/README @@ -19,9 +19,9 @@ POST-INSTALL Now it's time to create your own "boot menu": # # Copy sample file - # cp /boot/grub/menu.lst.sample /boot/grub/menu.lst + # cp /boot/grub/grub.conf.sample /boot/grub/grub.conf # # Modify it for your system - # vi /boot/grub/menu.lst + # vi /boot/grub/grub.conf For more information about setting up your own grub boot menu file: http://www.gnu.org/manual/grub-0.92/html_mono/grub.html#Configuration @@ -43,9 +43,8 @@ POST-INSTALL PRECAUTION Installing a new boot manager is like modifiying the partition table - using fdisk - or installing a new system kernel. Please create a rescue - boot disk first :) - This is a heavy patched version of grub - Use it on your own risk ! + or installing a new system kernel. Please create a rescue disk first :) + This is a heavily patched version of grub - Use it at your own risk ! Matt Housh <jaeger(a)crux.nu> diff --git a/grub/grub.conf.sample b/grub/grub.conf.sample new file mode 100644 index 0000000..5a066ab --- /dev/null +++ b/grub/grub.conf.sample @@ -0,0 +1,64 @@ +### Global settings + +## CRUX splash image +splashimage (hd0,0)/boot/grub/crux03.xpm.gz +## define special fore-/background colors for splash screen image +foreground = FFFFFF +background = AAAAAA + +## shaded text +#shade 1 + +## time to wait for user interaction +timeout 5 + +## default boot kernel +default 0 + +### GRUB Devices: +## +## Linux Grub +## ====================== +## /dev/hda (hd0) +## /dev/hda1 (hd0,0) +## /dev/hdb (hd1) +## /dev/hdb1 (hd1,0) +## /dev/fd0 (fd0) + +### Remember: +## The Linux kernel 2.4.19 has a bug which prevents using of devfs +## device names (/dev/disc/disc0/part1,..). CRUX 0.9.4 comes with +## 2.4.19 ! + +## Default menu entries + +title CRUX +kernel (hd0,0)/boot/vmlinuz root=/dev/hda1 + +title CRUX +kernel (hd0,0)/boot/vmlinuz.old root=/dev/hda1 + +### Special cases + +## Boot special bootimage +#title Memtest +#kernel (hd0,0)/boot/memtest.bin + +## Boot Microsoft Windows(TM) +#title Windows +#root (hd0,5) +#makeactive +#chainloader +1 + +## Boot from Floppy +#title floppy +#root (fd0) +#chainloader +1 + +## Boot with different /boot partition +## / = /dev/hdb2 = (hd1,1) +## /boot = /dev/hdb1 = (hd1,0) +## +#title CRUX GNU/Linux drive 2 +#kernel (hd1,0)/vmlinuz root=/dev/hdb2 +

1 0