diff options
| author | Robby Workman <rworkman@slackware.com> | 2020-02-26 21:49:44 -0600 |
|---|---|---|
| committer | Robby Workman <rworkman@slackware.com> | 2020-02-26 21:49:44 -0600 |
| commit | dda9a375370e659240fa9f77641c5dbe700253ad (patch) | |
| tree | 59f241d7756761a14ed562cd3d2cf9f986ca46cf | |
| parent | 4be95fdf527a88b055bb8d5732e57f1f529e7448 (diff) | |
| download | slackpkg-dda9a375370e659240fa9f77641c5dbe700253ad.tar.xz | |
Revert "More fixups for alternate ROOT ; thanks to zerouno."
This reverts commit fcc58ff5068146ab016c2f897bc14d4482f4a9cd
because it breaks lxc container creation; ponce stated on LQ
that "seems that forcing $CONF under $ROOT is what break things
here: $CONF in the template is used to have a temporary location,
outside of the container, in which to store the template, a
blacklist and a mirror configuration for the container creation"
| -rw-r--r-- | files/core-functions.sh | 8 | ||||
| -rw-r--r-- | files/slackpkg | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/files/core-functions.sh b/files/core-functions.sh index ba505cb..0db3ffe 100644 --- a/files/core-functions.sh +++ b/files/core-functions.sh @@ -151,12 +151,12 @@ function system_setup() { fi done - TEMPLATEDIR=${ROOT}/$CONF/templates + TEMPLATEDIR=$CONF/templates if [ ! -d $TEMPLATEDIR ]; then mkdir $TEMPLATEDIR fi - SLACKCFVERSION=$(grep "# v[0-9.]\+" ${ROOT}/$CONF/slackpkg.conf | cut -f2 -dv) + SLACKCFVERSION=$(grep "# v[0-9.]\+" $CONF/slackpkg.conf | cut -f2 -dv) CHECKSUMSFILE=${ROOT}/${WORKDIR}/CHECKSUMS.md5 KERNELMD5=$(md5sum /boot/vmlinuz 2>/dev/null) DIALOG_MAXARGS=${DIALOG_MAXARGS:-19500} @@ -644,7 +644,7 @@ function makelist() { for ARGUMENT in $(echo $INPUTLIST); do for i in $(cat ${TMPDIR}/pkglist ${TMPDIR}/tmplist | \ grep -w -- "${ARGUMENT}" | cut -f2 -d\ | sort -u); do - grep -qx "${i}" ${ROOT}/${CONF}/blacklist || LIST="$LIST $i" + grep -qx "${i}" ${CONF}/blacklist || LIST="$LIST $i" done done ;; @@ -1232,7 +1232,7 @@ function sanity_check() { FILES="$(diff $TMPDIR/list1 $TMPDIR/list2 | grep '<' | cut -f2 -d\ )" if [ "$FILES" != "" ]; then for i in $FILES ; do - grep -qx "${i}" ${ROOT}/${CONF}/blacklist && continue + grep -qx "${i}" ${CONF}/blacklist && continue DOUBLEFILES="$DOUBLEFILES $i" done unset FILES diff --git a/files/slackpkg b/files/slackpkg index bbc3001..52f8c9b 100644 --- a/files/slackpkg +++ b/files/slackpkg @@ -66,8 +66,8 @@ SOURCE=$(sed -n ' \@^cdrom://@p \@^local://@p \@^https\{0,1\}://@p - \@^ftps\{0,1\}://@p' ${ROOT}/$CONF/mirrors) -. ${ROOT}/$CONF/slackpkg.conf + \@^ftps\{0,1\}://@p' $CONF/mirrors) +. $CONF/slackpkg.conf ERROR="" # Set temporary directory @@ -466,7 +466,7 @@ case "$CMD" in # all blacklisted packages if [ "$INPUTLIST" = "" ]; then echo -e "Packages in blacklist:\n" - grep -e "^\([a-z]\)" ${ROOT}/$CONF/blacklist | $MORECMD + grep -e "^\([a-z]\)" $CONF/blacklist | $MORECMD cleanup fi |