From: Kern Sibbald Date: Thu, 22 Dec 2005 00:58:44 +0000 (+0000) Subject: Some updates X-Git-Tag: Release-1.38.3~10 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=011479c80f643b8a2b068aefbd00dc39bac08430;p=bacula%2Frescue Some updates --- diff --git a/rescue/linux/cdrom/makebinaries b/rescue/linux/cdrom/makebinaries index dbaaf06..a114dd3 100755 --- a/rescue/linux/cdrom/makebinaries +++ b/rescue/linux/cdrom/makebinaries @@ -89,6 +89,9 @@ done cp -fp /lib/ld-linux.so.* roottree/lib/ strip `find roottree/lib/ -maxdepth 1 -type f` 2>/dev/null +# Grub crap +mkdir -p roottree/usr/share/grub +cp -fpr /usr/share/grub/* roottree/usr/share/grub # # Get a bunch of stuff from /etc diff --git a/rescue/linux/cdrom/makeinitrd b/rescue/linux/cdrom/makeinitrd index 2474cf9..e543af8 100755 --- a/rescue/linux/cdrom/makeinitrd +++ b/rescue/linux/cdrom/makeinitrd @@ -2,18 +2,9 @@ TOPDIR=`pwd` -mkdir -p /mnt/loop1 /mnt/loop2 - -# -# we need to set aside a few loop devices. I chose (in reverse order of their appearance) -# -- loop1 for the boot image -# -- loop2 for the RAM disk image -# since the loop1 choice is reflected in the lilo.loopfix file, -# you should not change that (or you need to change the file). -# I had used loop0 first, but I found that this is used by the Samba daemon. -# Also, I assume that the mount points are /mnt/loop{1,2}. -# In principle we could do with one, but it comes in handy to be able to -# leave one mounted, so I took two different ones. +LOOP2=/tmp/bacula_rescue_loop2 +rm -rf $LOOP2 +mkdir -p $LOOP2 # Assume that everything to be loaded into memory with the # RAM disk image (initrd) is is in the roottree directory. @@ -32,7 +23,8 @@ rm -f root dd if=/dev/zero of=$TOPDIR/root bs=1k count=$ISIZE -umount /mnt/loop2 2>/dev/null >/dev/null +# cleanup any prior left over stuff +umount $LOOP2 2>/dev/null >/dev/null losetup -d /dev/loop2 2>/dev/null >/dev/null # associate it with /dev/loop2 @@ -46,22 +38,26 @@ if [ $? != 0 ] ; then fi # we mount it... -mount /dev/loop2 /mnt/loop2 - +mount /dev/loop2 $LOOP2 # ... and delete the lost+found directory -rm -rf /mnt/loop2/lost+found +rm -rf $LOOP2/lost+found # then we copy the contents of our roottree to this filesystem -cp -dpR roottree/* /mnt/loop2/ -if [ $? != 0 ] ; then - echo "RAM disk build failed." - exit 1 -fi +cp -dpR roottree/* $LOOP2/ +cprtn=$? # and unmount and divorce /dev/loop2 -umount /mnt/loop2 +umount $LOOP2 losetup -d /dev/loop2 +rm -rf $LOOP2 + +# If above copy failed, bail out +if [ $cprtn != 0 ] ; then + echo "RAM disk build failed." + exit 1 +fi +# This is a newer way of creating a ramfs, which we don't use # (cd roottree; find . | cpio --quiet -c -o) >root echo "Building initial RAM disk done" diff --git a/rescue/linux/cdrom/makekernel b/rescue/linux/cdrom/makekernel index 3bf2224..eb8d76b 100755 --- a/rescue/linux/cdrom/makekernel +++ b/rescue/linux/cdrom/makekernel @@ -5,7 +5,8 @@ # TOPDIR=`pwd` -KERNEL=`uname -r` +KERNEL="2.6.14-1.1653_FC4" +#KERNEL=`uname -r` rm -rf roottree/dev tar xfz dev.tar.gz -C roottree diff --git a/rescue/linux/cdrom/rootsbin.list b/rescue/linux/cdrom/rootsbin.list index 2f55e39..93df9fc 100644 --- a/rescue/linux/cdrom/rootsbin.list +++ b/rescue/linux/cdrom/rootsbin.list @@ -53,6 +53,10 @@ roottree/sbin/gdb roottree/sbin/getkey roottree/sbin/grep roottree/sbin/grub +roottree/sbin/gubby +roottree/sbin/grub-install +roottree/sbin/grub-md5-crypt +roottree/sbin/grub-grub-terminfo roottree/sbin/gunzip roottree/sbin/gzip roottree/sbin/halt diff --git a/rescue/version.h b/rescue/version.h index 13000b0..64e5243 100644 --- a/rescue/version.h +++ b/rescue/version.h @@ -1,5 +1,5 @@ /* */ #undef VERSION -#define VERSION "1.8.1" -#define BDATE "28 September 2005" -#define LSMDATE "28Sep05" +#define VERSION "1.8.2" +#define BDATE "21 December 2005" +#define LSMDATE "21Dec05"