psi-jack/gen2stage4
1
0
Fork 0
mirror of https://github.com/erenfro/gen2stage4.git synced 2024-09-21 03:02:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #10 from tomslobodnik/master

Browse source 
fix TARGET path handling
This commit is contained in:
Horea Christian 2017-03-22 17:56:13 +01:00 committed by GitHub
commit a026ef0045
1 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
mkstage4.sh
View file

@ -65,6 +65,12 @@ then
exit 1
fi
# make sure TARGET path ends with slash
if [ "`echo $TARGET | grep -c '\/$'`" -le "0" ]
then
TARGET="${TARGET}/"
fi
# shifts pointer to read mandatory output file specification
shift $(($OPTIND - 1))
ARCHIVE=$1
@ -96,18 +102,18 @@ shift;OPTIONS="$@"
# Excludes:
EXCLUDES="\
--exclude=${TARGET}/home/*/.bash_history \
--exclude=${TARGET}/dev/* \
--exclude=${TARGET}/media/* \
--exclude=${TARGET}/mnt/*/* \
--exclude=${TARGET}/proc/* \
--exclude=${TARGET}/run/* \
--exclude=${TARGET}/sys/* \
--exclude=${TARGET}/tmp/* \
--exclude=${TARGET}/usr/portage/* \
--exclude=${TARGET}/var/lock/* \
--exclude=${TARGET}/var/log/* \
--exclude=${TARGET}/var/run/*"
--exclude=${TARGET}home/*/.bash_history \
--exclude=${TARGET}dev/* \
--exclude=${TARGET}media/* \
--exclude=${TARGET}mnt/*/* \
--exclude=${TARGET}proc/* \
--exclude=${TARGET}run/* \
--exclude=${TARGET}sys/* \
--exclude=${TARGET}tmp/* \
--exclude=${TARGET}usr/portage/* \
--exclude=${TARGET}var/lock/* \
--exclude=${TARGET}var/log/* \
--exclude=${TARGET}var/run/*"
if [ "$TARGET" == "/" ]
then
@ -116,12 +122,12 @@ fi
if [ ${EXCLUDE_CONNMAN} -eq 1 ]
then
EXCLUDES+=" --exclude=${TARGET}/var/lib/connman/*"
EXCLUDES+=" --exclude=${TARGET}var/lib/connman/*"
fi
if [ ${EXCLUDE_BOOT} -eq 1 ]
then
EXCLUDES+=" --exclude=${TARGET}/boot/*"
EXCLUDES+=" --exclude=${TARGET}boot/*"
fi
if [ ${EXCLUDE_LOST} -eq 1 ]
@ -145,7 +151,7 @@ then
echo "example: \$ `basename $0` -s /my-backup --exclude=/etc/ssh/ssh_host*"
echo ""
echo "COMMAND LINE PREVIEW:"
echo "tar $TAR_OPTIONS $EXCLUDES $OPTIONS -f $STAGE4_FILENAME *"
echo "tar $TAR_OPTIONS $EXCLUDES $OPTIONS -f $STAGE4_FILENAME ${TARGET}*"
echo ""
echo -n "Type \"yes\" to continue or anything else to quit: "
read AGREE
@ -154,7 +160,7 @@ fi
# start stage4 creation:
if [ "$AGREE" == "yes" ]
then
tar $TAR_OPTIONS $EXCLUDES $OPTIONS -f $STAGE4_FILENAME *
tar $TAR_OPTIONS $EXCLUDES $OPTIONS -f $STAGE4_FILENAME ${TARGET}*
fi
exit 0