tags 476757 + patch thanks Patch attached.
Regards,
--
Chris Lamb, UK [EMAIL PROTECTED]
GPG: 0x634F9A20
diff -urNad gibraltar-bootcd-2.1.orig/gibraltar-bootsupport/restore-etc
gibraltar-bootcd-2.1/gibraltar-bootsupport/restore-etc
--- gibraltar-bootcd-2.1.orig/gibraltar-bootsupport/restore-etc 2008-04-22
16:15:15.000000000 +0100
+++ gibraltar-bootcd-2.1/gibraltar-bootsupport/restore-etc 2008-04-22
16:19:57.000000000 +0100
@@ -65,17 +65,17 @@
mount -t unionfs -o dirs=$maskingmountpoint=rw:$unmaskedmountpoint=ro
unionfs $mountpoint || bash
if [ "$image" != "-" ]; then
- pushd $maskingmountpoint > /dev/null
+ cd $maskingmountpoint
tar xz --preserve --same-owner -f $image
- popd > /dev/null
+ cd $OLDPWD
fi
echo "done"
else
echo "Not creating a RAM disk for $2, disabled in /etc/gibraltar/config"
echo -n "Unpacking saved data to /etc ... "
- pushd $mountpoint > /dev/null
+ cd $mountpoint
tar xz --preserve --same-owner -f $image
- popd > /dev/null
+ cd $OLDPWD
echo "done"
fi
diff -urNad gibraltar-bootcd-2.1.orig/gibraltar-bootsupport/restore-etc-old2
gibraltar-bootcd-2.1/gibraltar-bootsupport/restore-etc-old2
--- gibraltar-bootcd-2.1.orig/gibraltar-bootsupport/restore-etc-old2
2008-04-22 16:15:15.000000000 +0100
+++ gibraltar-bootcd-2.1/gibraltar-bootsupport/restore-etc-old2 2008-04-22
16:17:42.000000000 +0100
@@ -51,16 +51,16 @@
echo -n "Creating configuration RAM disk (maximum ${ETCDISK_SIZE}b)... "
mount_tmpfs $ETCDISK_SIZE $mountpoint
- pushd $mountpoint > /dev/null
+ cd $mountpoint
tar xz --preserve --same-owner -f $image
- popd > /dev/null
+ cd $OLDPWD
echo "done"
else
echo "Not creating a RAM disk for $2, disabled in /etc/gibraltar/config"
echo -n "Unpacking saved data to /etc ... "
- pushd $mountpoint > /dev/null
+ cd $mountpoint
tar xz --preserve --same-owner -f $image
- popd > /dev/null
+ cd $OLDPWD
echo "done"
fi
diff -urNad gibraltar-bootcd-2.1.orig/gibraltar-bootsupport/save-etc
gibraltar-bootcd-2.1/gibraltar-bootsupport/save-etc
--- gibraltar-bootcd-2.1.orig/gibraltar-bootsupport/save-etc 2008-04-22
16:15:15.000000000 +0100
+++ gibraltar-bootcd-2.1/gibraltar-bootsupport/save-etc 2008-04-22
16:17:59.000000000 +0100
@@ -63,7 +63,7 @@
success=0
while [ $success -ne 1 ] && [ $try -le $MAX_SAVE_TRIES ]; do
echo -n "Saving $mountpoint to $image ... "
- pushd $maskingmountpoint > /dev/null
+ cd $maskingmountpoint
tar cz --preserve --same-owner --atime-preserve -f $image *
echo "done"
echo "Checking saved data for changes ... "
@@ -73,7 +73,7 @@
else
echo "unsaved changes detected - retrying."
fi
- popd > /dev/null
+ cd $OLDPWD
try=`expr $try + 1`
done
diff -urNad
gibraltar-bootcd-2.1.orig/gibraltar-bootsupport/setup-unconfigured.sh
gibraltar-bootcd-2.1/gibraltar-bootsupport/setup-unconfigured.sh
--- gibraltar-bootcd-2.1.orig/gibraltar-bootsupport/setup-unconfigured.sh
2008-04-22 16:15:15.000000000 +0100
+++ gibraltar-bootcd-2.1/gibraltar-bootsupport/setup-unconfigured.sh
2008-04-22 16:21:05.000000000 +0100
@@ -34,8 +34,8 @@
# is the system is unconfigured at this stage, run all setup scripts
if [ -f /etc/unconfigured ]; then
echo
- echo -e "This is an ${COLOR_RED}unconfigured${COLOR_NORMAL} system."\
- "Running configuration phase now ..."
+ printf "This is an ${COLOR_RED}unconfigured${COLOR_NORMAL} system."\
+ "Running configuration phase now ...\n"
echo "- start
------------------------------------------------------------------------"
for script in /etc/setup.d/*; do
# Ignore dangling symlinks for now.
diff -urNad gibraltar-bootcd-2.1.orig/gibraltar-bootsupport/update-finalize
gibraltar-bootcd-2.1/gibraltar-bootsupport/update-finalize
--- gibraltar-bootcd-2.1.orig/gibraltar-bootsupport/update-finalize
2008-04-22 16:15:15.000000000 +0100
+++ gibraltar-bootcd-2.1/gibraltar-bootsupport/update-finalize 2008-04-22
16:20:03.000000000 +0100
@@ -5,7 +5,7 @@
if [ -e /initrd/mnt/media/updating ]; then
echo "System update in progress, first boot seems successful."
- echo -e "Finalizing update now ... "
+ echo "Finalizing update now ... "
mount -o remount,rw /initrd/mnt/media/
rm /initrd/mnt/media/updating
rm /initrd/mnt/media/md5sums.lst
diff -urNad gibraltar-bootcd-2.1.orig/gibraltar-bootsupport/update-removeold
gibraltar-bootcd-2.1/gibraltar-bootsupport/update-removeold
--- gibraltar-bootcd-2.1.orig/gibraltar-bootsupport/update-removeold
2008-04-22 16:15:15.000000000 +0100
+++ gibraltar-bootcd-2.1/gibraltar-bootsupport/update-removeold 2008-04-22
16:16:35.000000000 +0100
@@ -4,7 +4,7 @@
# This script removes the old files saved during the last upload.
if [ -e /initrd/mnt/media/gibraltar.old -o -e /initrd/mnt/media/syslinux.old
-o -e /initrd/mnt/media/initrd.old ]; then
- echo -e "Removing old Gibraltar version ... "
+ echo "Removing old Gibraltar version ... "
mount -o remount,rw /initrd/mnt/media/
rm /initrd/mnt/media/id.old
rm /initrd/mnt/media/linux.old
@@ -21,7 +21,7 @@
fi
if [ -e /initrd/mnt/media/new ]; then
- echo -e "Removing files from last upgrade ... "
+ echo "Removing files from last upgrade ... "
mount -o remount,rw /initrd/mnt/media/
rm -r /initrd/mnt/media/new
mount -o remount,ro /initrd/mnt/media/
diff -urNad gibraltar-bootcd-2.1.orig/gibraltar-bootsupport/update-rollback
gibraltar-bootcd-2.1/gibraltar-bootsupport/update-rollback
--- gibraltar-bootcd-2.1.orig/gibraltar-bootsupport/update-rollback
2008-04-22 16:15:15.000000000 +0100
+++ gibraltar-bootcd-2.1/gibraltar-bootsupport/update-rollback 2008-04-22
16:16:26.000000000 +0100
@@ -4,7 +4,7 @@
# This script does a rollback of the last update.
if [ -e /initrd/mnt/media/gibraltar.old ]; then
- echo -e "Rolling back last update ... "
+ echo "Rolling back last update ... "
mount -o remount,rw /initrd/mnt/media/
mv /initrd/mnt/media/id.old /initrd/mnt/media/id.txt
mv /initrd/mnt/media/linux.old /initrd/mnt/media/linux
signature.asc
Description: PGP signature
