diff options
| author |   Eric Hameleers <alien@slackware.com> | 2017-02-15 21:46:46 +0100 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2017-02-15 21:46:46 +0100 |
| commit | e247ec02d9c85c1e6ec082cfcee6119540d76c56 (patch) | |
| tree | 5cbf77358f2dabd0321f96556be6cb8143710b1d | |
| parent | 08f3e4345d55f5a666f45653d7b580ee6499a07e (diff) | |
| download | liveslak-e247ec02d9c85c1e6ec082cfcee6119540d76c56.tar.gz liveslak-e247ec02d9c85c1e6ec082cfcee6119540d76c56.tar.xz | |
make_slackware_live.sh: shuffle the order of sed operations for setup2hd.
The 'sed' commandline processing the scripts in /usr/share/liveslak
failed to make the correct substitution for "T_PX=/mnt" in the
'SeTpartitions' script, which is part of the Slackware installer.
| -rwxr-xr-x | make_slackware_live.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/make_slackware_live.sh b/make_slackware_live.sh index f2a6e7a..7dfcdde 100755 --- a/make_slackware_live.sh +++ b/make_slackware_live.sh @@ -1356,7 +1356,11 @@ if ls ${LIVE_ROOTDIR}/boot/vmlinuz-huge-* 1>/dev/null 2>/dev/null; then rm -f setup cd - 1>/dev/null # Fix some occurrences of '/mnt' that should not be used in the Live ISO: - sed -i -e 's, /mnt, ${T_PX},g' -e 's,=/mnt$,=${T_PX},g' -e 's,=/mnt/,=${T_PX}/,g' -e 's,T_PX=/mnt,T_PX="`cat $TMP/SeTT_PX`",g' ${LIVE_ROOTDIR}/usr/share/${LIVEMAIN}/* + sed -i ${LIVE_ROOTDIR}/usr/share/${LIVEMAIN}/* \ + -e 's,T_PX=/mnt,T_PX="`cat $TMP/SeTT_PX`",g' \ + -e 's, /mnt, ${T_PX},g' \ + -e 's,=/mnt$,=${T_PX},g' \ + -e 's,=/mnt/,=${T_PX}/,g' # If T_PX is used in a script, it should be defined first: for FILE in ${LIVE_ROOTDIR}/usr/share/${LIVEMAIN}/* ; do if grep -q T_PX $FILE ; then |