Changeset 3780 in MondoRescue for branches

Timestamp:

Jan 25, 2021, 7:43:10 PM (4 years ago)

Author:

Bruno Cornec

Message:

normalize usage of syslinux variable with dirname

Location:

branches/3.3

Files:

• ansible/group_vars/all (modified) (2 diffs)
• mindi/mindi (modified) (2 diffs)

branches/3.3/ansible/group_vars/all

@@ -3 +3 @@
 host: mondorescue.hpintelco.org
 ip_ext: 185.170.48.239
-hyperlinux: 82.236.159.40
+hyperlinux: 193.251.72.40
 #  "{{ lookup('dig', 'www.hyper-linux.org') }}"
 sshkey:
@@ -10 +10 @@
   "{{ lookup('file', '/users/bruno/.ssh/pb_rsa.pub') }}"
 urpmi_server: http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib
+ip_int: 10.11.7.195
+netmask_int: 255.255.255.192
+gw: 10.11.7.193
+smtp: 10.11.3.13 
+dns1: 10.11.0.13
+dns2: 10.11.0.14
+keypwd: XXXXXXXXXXX
+dbpwd: XXXXXXXXXXX

branches/3.3/mindi/mindi

@@ -2288 +2288 @@
                 LogFile "INFO: Copying $LDLINUXE64 to $efidir"
                 cp $LDLINUXE64 $efidir 2>> $LOGFILE || Die "Cannot copy $LDLINUXE64 to $efidir). Did you run out of disk space?"
-                cp $LDLINUXE64/../libutil.c32 $efidir 2>> $LOGFILE || Die "Cannot copy libutil.c32 to $efidir). Did you run out of disk space?"
-                if [ -e $LDLINUXE64/../isolinux.c32 ]; then
-                    cp $LDLINUXE64/../isolinux.c32 $efidir 2>> $LOGFILE || Die "Cannot copy isolinux.c32 to $efidir). Did you run out of disk space?"
+                cp $(dirname $LDLINUXE64)/libutil.c32 $efidir 2>> $LOGFILE || Die "Cannot copy libutil.c32 to $efidir). Did you run out of disk space?"
+                if [ -e $(dirname $LDLINUXE64)/isolinux.c32 ]; then
+                        cp $(dirname $LDLINUXE64)/isolinux.c32 $efidir 2>> $LOGFILE || Die "Cannot copy isolinux.c32 to $efidir). Did you run out of disk space?"
                 fi
             fi
@@ -2307 +2307 @@
         cp $LDLINUXC32 "$tgdir" 2>> $LOGFILE || Die "Cannot copy $LDLINUXC32 to $tgdir. Did you run out of disk space?"
     fi
-    if [ -e `dirname $LDLINUXC32`/isolinux.c32 ]; then
+    if [ -e $(dirname $LDLINUXC32)/isolinux.c32 ]; then
         LogFile "INFO: Copying isolinux.c32 to $tgdir"
-        cp `dirname $LDLINUXC32`/isolinux.c32 $tgdir 2>> $LOGFILE || Die "Cannot copy isolinux.c32 to $tgdir). Did you run out of disk space?"
+        cp $(dirname $LDLINUXC32)/isolinux.c32 $tgdir 2>> $LOGFILE || Die "Cannot copy isolinux.c32 to $tgdir). Did you run out of disk space?"
     fi