Some tweaks to the scripts

[bacula/rescue] / rescue / linux / cdrom / makebinaries

diff --git a/rescue/linux/cdrom/makebinaries b/rescue/linux/cdrom/makebinaries
index dbaaf067d11a0a921c604bc93ef82a098fdc2231..b0f78ea650b8c3382e913b3a8253a97c3445941f 100755 (executable)
--- a/rescue/linux/cdrom/makebinaries
+++ b/rescue/linux/cdrom/makebinaries
@@ -48,7 +48,7 @@ for file in `cat ${TMPFILE}` ; do
     command=`basename $file`
     fullfile=`which $command 2> /dev/null`
     if [ x$fullfile != x ] ; then
-        echo "updating $command in roottree with $fullfile"
+#       echo "updating $command in roottree with $fullfile"
         cp -fpd $fullfile $file
         if [ $? != 0 ] ; then
            echo "Update failed."
@@ -64,6 +64,8 @@ rm -f ${TMPFILE}
 
 cd roottree/sbin
 ln -sf halt reboot
+# Eliminate recursive link
+rm -f sbin
 cd $TOPDIR
 
 # Copy all needed shared libraries
@@ -89,6 +91,16 @@ done
 cp -fp /lib/ld-linux.so.* roottree/lib/
 strip `find roottree/lib/ -maxdepth 1 -type f` 2>/dev/null
 
+# Grab grub crap
+if [ -e /usr/share/grub ] ; then
+   mkdir -p roottree/usr/share/grub
+   cp -fpr /usr/share/grub/* roottree/usr/share/grub
+elif [ -e /lib/grub ] ; then
+   mkdir -p roottree/lib/grub
+   cp -fpr /lib/grub/* roottree/lib/grub
+else
+   echo "======= Warning could not find grub scripts ========"
+fi
 
 #
 # Get a bunch of stuff from /etc
@@ -134,12 +146,12 @@ fi
 
 if [ -e /etc/ssh ] ; then
    cp -a /etc/ssh roottree/etc/
-   echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-   echo "!!!!                                             !!!!"
-   echo "!!!! Warning your /etc/ssh directory was copied. !!!!"
-   echo "!!!! Keep this directory and the CDROM secure.   !!!!"
-   echo "!!!!                                             !!!!"
-   echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+   echo "====================================================="
+   echo "====                                             ===="
+   echo "==== Warning your /etc/ssh directory was copied. ===="
+   echo "==== Keep this directory and the CDROM secure.   ===="
+   echo "====                                             ===="
+   echo "====================================================="
 fi
 if [ -e /etc/security ] ; then
   cp -a /etc/security roottree/etc/