Changeset 2488 in MondoRescue for branches/2.2.10/mindi/rootfs/sbin

Timestamp:

Nov 18, 2009, 9:41:00 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3621@localhost: bruno | 2009-11-18 10:53:33 +0100

• PrepareBootDiskImage replaces previously duplicated functions for lilo/isolinux handling and completely re-written
• remove useless rootfs files
• Use MINDI_CACHE instead of /tmp globally

Location:

branches/2.2.10/mindi/rootfs/sbin

Files:

• find-and-mount-cdrom (modified) (1 diff)
• ide-opt (modified) (1 diff)
• init (modified) (1 diff)
• install-additional-tools (modified) (3 diffs)

branches/2.2.10/mindi/rootfs/sbin/find-and-mount-cdrom

@@ -70 +70 @@
     [ "$SECOND_TRY" ] && add="At 2nd attempt, " || add=""
     LogIt $add"CD-ROM found and mounted at $device" 3
-    echo "$device" > /tmp/CDROM-LIVES-HERE
+    echo "$device" > $MINDI_CACHE/CDROM-LIVES-HERE
     LogIt "find-and-mount-cdrom --- leaving (0)"
     exit 0

branches/2.2.10/mindi/rootfs/sbin/ide-opt

@@ -8 +8 @@
     echo -e -n "Optimizing IDE drive access..."
 
-    cdrom_lives_here=`cat /tmp/CDROM-LIVES-HERE`
+    cdrom_lives_here=`cat $MINDI_CACHE/CDROM-LIVES-HERE`
     if [ "$?" -ne "0" ] ; then
     echo "I don't know where the CDROM lives. Optimization cancelled."

branches/2.2.10/mindi/rootfs/sbin/init

@@ -84 +84 @@
 
 LaunchTerminals() {
-    openvt 2 /bin/sh
-    openvt 3 /bin/sh
-    openvt 4 /bin/sh
-    openvt 5 /bin/sh
-    openvt 6 /bin/sh
-    openvt 7 /bin/sh /sbin/wait-for-petris
-    openvt 8 /usr/bin/tail -f $LOGFILE
+    openvt -l /bin/sh
+    openvt -l /bin/sh
+    openvt -l /bin/sh
+    openvt -l /bin/sh
+    openvt -l /bin/sh
+    openvt -l /bin/sh /sbin/wait-for-petris
+    openvt -l /usr/bin/tail -f $LOGFILE
     # May avoid shell error messages
-    chmod 666 /dev/tty* /dev/console
+    # chmod 666 /dev/tty* /dev/console
     # By default first serial line is configured as tty
     # Required to have a correct serial console support (MP on ia64 or VSP with iLO2 e.g.)

branches/2.2.10/mindi/rootfs/sbin/install-additional-tools

@@ -15 +15 @@
 # ------------ main -----------
 
-# if the file '/tmp/CDROM-LIVES-HERE' exists then we should use the CD
+# if the file '$MINDI_CACHE/CDROM-LIVES-HERE' exists then we should use the CD
 
 LogIt "Starting install-additional-tools"
@@ -40 +40 @@
 
     mountpoint=/dev/null
-    [ -e "/tmp/CDROM-LIVES-HERE" ] && mountpoint=/mnt/cdrom/images
+    [ -e "$MINDI_CACHE/CDROM-LIVES-HERE" ] && mountpoint=/mnt/cdrom/images
     tarball=$mountpoint/all.tar.gz
-    if [ -e "/tmp/CDROM-LIVES-HERE" ] ; then
+    if [ -e "$MINDI_CACHE/CDROM-LIVES-HERE" ] ; then
         [ -e "$tarball" ] || LogIt "Can't find CD's $tarball" 1
     fi
@@ -58 +58 @@
     cd $old_pwd
     echo -e -n "\r"
-    [ ! -e "/tmp/CDROM-LIVES-HERE" ] && umount $mountpoint
+    [ ! -e "$MINDI_CACHE/CDROM-LIVES-HERE" ] && umount $mountpoint
     sleep 1
 fi