Changeset 3293 in MondoRescue

Timestamp:

May 27, 2014, 5:53:16 PM (10 years ago)

Author:

Bruno Cornec

Message:

• Fix mount call in rcS to use devtmpfs instead of tmpfs for /dev and systemd
• Changing how logging is done in mindi to support being called by mondo AND printing percentage progress in UI

Location:

branches/3.2

Files:

• mindi/mindi (modified) (2 diffs)
• mindi/rootfs/etc/init.d/rcS (modified) (2 diffs)
• mondo/src/common/libmondo-archive.c (modified) (2 diffs)

branches/3.2/mindi/mindi

@@ -914 +914 @@
 
 LogProgress() {
-    local i progress modres noof_lines
+    local i progress modres noof_lines title
  
     progress=$1
     noof_lines=$2
-
-    echo -en "\r\t\t\t\t\t\t\t\t"
+    title=$3
+
     i=$(($progress*100))
     if [ $noof_lines -ne 0 ]; then
@@ -926 +926 @@
         i=0
     fi
-    echo -en "$i"
-    echo -en "%"
-    modres=$(($progress%4))
-    [ "$modres" -eq "0" ] && echo -en "\t/"
-    [ "$modres" -eq "1" ] && echo -en "\t-"
-    [ "$modres" -eq "2" ] && echo -en "\t\\"
-    [ "$modres" -eq "3" ] && echo -en "\t|"
+
+    if [ _"$MONDO_SHARE" != _"" ]; then 
+        echo "$title        $i%"
+    else
+        echo -en "\r\t\t\t\t\t\t\t\t"
+        echo -en "$i"
+        echo -en "%"
+        modres=$(($progress%4))
+        [ "$modres" -eq "0" ] && echo -en "\t/"
+        [ "$modres" -eq "1" ] && echo -en "\t-"
+        [ "$modres" -eq "2" ] && echo -en "\t\\"
+        [ "$modres" -eq "3" ] && echo -en "\t|"
+    fi
 }
 

branches/3.2/mindi/rootfs/etc/init.d/rcS

@@ -383 +383 @@
     mv /dev /dev.static
     mkdir /dev
-    mount -n -o size=5M,mode=0755 -t tmpfs none /dev
-    MakeExtraNodes
-    mount -n -t devpts -o mode=620 none /dev/pts
+    # Contributed during LinuxCon Japan !
+    if [ -x /usr/lib/systemd/systemd-udevd ]; then
+        mount -n -t devtmpfs none /dev
+    else
+        mount -n -o size=5M,mode=0755 -t tmpfs none /dev
+        MakeExtraNodes
+        mount -n -t devpts -o mode=620 none /dev/pts
+    fi
     mount -n -t tmpfs  none /dev/shm
     if [ -e /proc/sys/kernel/hotplug ]; then
@@ -410 +415 @@
             # from https://github.com/hut/minirc/blob/master/rc
             echo "INFO: This is the systemd version of udev"
-            mkdir -p /run/systemd/journal
-            mount -n -t tmpfs tmpfs /sys/fs/cgroup
+            # Contributed during LinuxCon Japan
+            #mkdir -p /run/systemd/journal
+            #mount -n -t tmpfs tmpfs /sys/fs/cgroup
             #mount -n -t cgroup cgroup /sys/fs/cgroup/systemd
             /usr/lib/systemd/systemd-udevd --daemon

branches/3.2/mondo/src/common/libmondo-archive.c

@@ -841 +841 @@
 6=\"%s\" 7=%ld 8=\"%s\" 9=\"%s\" 10=\"%s\" \
 11=\"%s\" 12=%s 13=%ld 14=\"%s\" 15=\"%s\" 16=\"%s\" 17=\"%s\" 18=%ld 19=%d",*/
-    mr_asprintf(command, "mindi %s --custom %s %s/images '%s' '%s' \
-'%s' %ld '%s' '%s' '%s' \
-'%s' %s %ld '%s' '%s' '%s' '%s' %ld %d '%s' 2>&1 > %s", tmp2, bkpinfo->tmpdir,  // parameter #2
+    mr_asprintf(command, "mindi %s --custom %s %s/images '%s' '%s' '%s' %ld '%s' '%s' '%s' '%s' %s %ld '%s' '%s' '%s' '%s' %ld %d '%s' '%s' 2>&1 > %s", 
+            tmp2, 
+            bkpinfo->tmpdir,    // parameter #2
             bkpinfo->scratchdir,    // parameter #3
             bkpinfo->kernel_path,   // parameter #4
@@ -863 +863 @@
             use_gzip_sz,        // parameter #19 (STRING)
             use_lzma_sz,        // parameter #20 (STRING)
-            value,              // parameter #21 (STRING)
+            value,          // parameter #21 (STRING)
             MONDO_LOGFILE,      // redirect to log file
-            MONDO_LOGFILE);
+            );
 
     mr_free(tmp2);