summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2017-09-19 19:36:52 +0200
committer Eric Hameleers <alien@slackware.com>2017-09-19 19:36:52 +0200
commit34a2dfb17682d98229b4115e981a05067e6d788b (patch)
tree5a36863cfc91102d7dccfdf018a46452098893ca
parent6abd269ecdf654da088edfea52084d3d6bd9b199 (diff)
downloadliveslak-34a2dfb17682d98229b4115e981a05067e6d788b.tar.gz
liveslak-34a2dfb17682d98229b4115e981a05067e6d788b.tar.xz
iso2usb.sh - some minor tweaks
-rw-r--r--iso2usb.sh10
1 files changed, 6 insertions, 4 deletions
diff --git a/iso2usb.sh b/iso2usb.sh
index 4a7e4f6..7b386fc 100644
--- a/iso2usb.sh
+++ b/iso2usb.sh
@@ -23,6 +23,9 @@
# Be careful:
set -e
+# Limit the search path:
+export PATH="/usr/sbin:/sbin:/usr/bin:/bin"
+
# Set to '1' if you want to ignore all warnings:
FORCE=0
@@ -44,9 +47,6 @@ UNATTENDED=0
# By default do not show file operations in detail:
VERBOSE=0
-# Limit the search path:
-export PATH="/usr/sbin:/sbin:/usr/bin:/bin"
-
# Variables to store content from an initrd we are going to refresh:
OLDPERSISTENCE=""
OLDWAIT=""
@@ -507,9 +507,11 @@ EOT
fi
# Continue with the common text message:
cat <<EOT
+# ---------------------------------------------------------------------------
# Vendor : $(cat /sys/block/$(basename $TARGET)/device/vendor)
# Model : $(cat /sys/block/$(basename $TARGET)/device/model)
# Size : $(( $(cat /sys/block/$(basename $TARGET)/size) / 2048)) MB
+# ---------------------------------------------------------------------------
#
# FDISK OUTPUT:
EOT
@@ -646,7 +648,7 @@ fi
if [ $REFRESH -eq 1 ]; then
# Clean out old Live system data:
echo "--- Cleaning out old Live system data."
- LIVEMAIN="$(echo $(find ${ISOMNT} -name "0099*") |rev |cut -d/ -f3 |rev)"
+ LIVEMAIN="$(echo $(find ${ISOMNT} -name "0099*" |tail -1) |rev |cut -d/ -f3 |rev)"
rsync -rlptD --delete \
${ISOMNT}/${LIVEMAIN}/system/ ${USBMNT}/${LIVEMAIN}/system/
if [ -f ${USBMNT}/boot/extlinux/ldlinux.sys ]; then