commit 71232acbb57c42cca742e2a9036eeff7a3ff6d9a Author: Brett Goulder <predatorfreak@dcaf-security.org> Date: Sat Mar 22 07:41:54 2008 -0400 grub: Revert the location of the stage files to /usr/share, update README on the config file. diff --git a/grub/.footprint b/grub/.footprint index ec37349..b855f55 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/grub.conf.sample +-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 @@ -12,22 +12,6 @@ drwxr-xr-x root/root sbin/ 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/lib/ -drwxr-xr-x root/root usr/lib/grub/ -drwxr-xr-x root/root usr/lib/grub/i386-pc/ --rw-r--r-- root/root usr/lib/grub/i386-pc/e2fs_stage1_5 --rw-r--r-- root/root usr/lib/grub/i386-pc/fat_stage1_5 --rw-r--r-- root/root usr/lib/grub/i386-pc/ffs_stage1_5 --rw-r--r-- root/root usr/lib/grub/i386-pc/iso9660_stage1_5 --rw-r--r-- root/root usr/lib/grub/i386-pc/jfs_stage1_5 --rw-r--r-- root/root usr/lib/grub/i386-pc/minix_stage1_5 --rw-r--r-- root/root usr/lib/grub/i386-pc/reiserfs_stage1_5 --rw-r--r-- root/root usr/lib/grub/i386-pc/stage1 --rw-r--r-- root/root usr/lib/grub/i386-pc/stage2 --rw-r--r-- root/root usr/lib/grub/i386-pc/stage2_eltorito --rw-r--r-- root/root usr/lib/grub/i386-pc/ufs2_stage1_5 --rw-r--r-- root/root usr/lib/grub/i386-pc/vstafs_stage1_5 --rw-r--r-- root/root usr/lib/grub/i386-pc/xfs_stage1_5 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 @@ -37,3 +21,18 @@ drwxr-xr-x root/root usr/man/man8/ -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 index 4c237c2..dbc19c2 100644 --- a/grub/.md5sum +++ b/grub/.md5sum @@ -2,4 +2,4 @@ 55e343038043e16df5293d63782373d0 crux03.xpm.gz a1103d28cd5d28e3af261192b1517612 grub-0.97-patches-2.tar.bz2 cd3f3eb54446be6003156158d51f4884 grub-0.97.tar.gz -1f2733522ab27183e3830d93733141ac grub.conf.sample +1f2733522ab27183e3830d93733141ac menu.lst.sample diff --git a/grub/Pkgfile b/grub/Pkgfile index 7ce4224..4c6de0b 100644 --- a/grub/Pkgfile +++ b/grub/Pkgfile @@ -6,12 +6,12 @@ name=grub version=0.97 -release=4 +release=5 source=(ftp://alpha.gnu.org/gnu/grub/$name-$version.tar.gz \ http://crux.nu/files/grub/0.97/$name-$version-patches-2.tar.bz2 \ http://crux.nu/files/grub/common/crux02.xpm.gz \ http://crux.nu/files/grub/common/crux03.xpm.gz \ - grub.conf.sample) + menu.lst.sample) build () { cd $name-$version @@ -30,6 +30,7 @@ build () { autoreconf --install --force ./configure --prefix=/usr \ + --libdir=/usr/share \ --mandir=/usr/man \ --sbindir=/sbin \ --disable-nls \ @@ -40,5 +41,5 @@ build () { rm -rf $PKG/usr/share/info mkdir -p $PKG/boot/grub - install -m 644 $SRC/{crux*,grub.conf.sample} $PKG/boot/grub/ + install -m 644 $SRC/{crux*,menu.lst.sample} $PKG/boot/grub/ } diff --git a/grub/README b/grub/README index 411bd61..4ad4067 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/grub.conf.sample /boot/grub/grub.conf + # cp /boot/grub/menu.lst.sample /boot/grub/menu.lst # # Modify it for your system - # vi /boot/grub/grub.conf + # 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 @@ -42,9 +42,8 @@ POST-INSTALL PRECAUTION - Installing a new boot manager is like modifiying the partition table + Installing a new boot manager is like modifying the partition table 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@crux.nu> +Brett Goulder <predatorfreak@dcaf-security.org> diff --git a/grub/grub.conf.sample b/grub/grub.conf.sample deleted file mode 100644 index 5a066ab..0000000 --- a/grub/grub.conf.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 - diff --git a/grub/menu.lst.sample b/grub/menu.lst.sample new file mode 100644 index 0000000..5a066ab --- /dev/null +++ b/grub/menu.lst.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 +