psi-jack/gen2stage4
1
0
Fork 0
mirror of https://github.com/erenfro/gen2stage4.git synced 2024-11-21 22:25:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge confidential file excludes into single -c option (#28)

Browse source 
Signed-off-by: Lucian Poston <lucianposton@pm.me>
This commit is contained in:
lucianposton 2020-03-24 21:43:25 -05:00 committed by GitHub
parent c8245059fc
commit 8ab90fa6b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
mkstage4.sh
View file

@ -8,7 +8,7 @@ fi
#set flag variables to null
EXCLUDE_BOOT=0
EXCLUDE_CONNMAN=0
EXCLUDE_CONFIDENTIAL=0
EXCLUDE_LOST=0
QUIET=0
USER_EXCL=()
@ -24,7 +24,7 @@ fi
USAGE="usage:\n\
$(basename "$0") [-q -c -b -l -k -p] [-s || -t <target-mountpoint>] [-e <additional excludes dir*>] <archive-filename> [custom-tar-options]\n\
-q: activates quiet mode (no confirmation).\n\
-c: excludes connman network lists.\n\
-c: excludes some confidential files (currently only .bash_history and connman network lists).\n\
-b: excludes boot directory.\n\
-l: excludes lost+found directory.\n\
-p: compresses parallelly using pbzip2.\n\
@ -51,7 +51,7 @@ do
S_KERNEL=1
;;
c)
EXCLUDE_CONNMAN=1
EXCLUDE_CONFIDENTIAL=1
;;
b)
EXCLUDE_BOOT=1
@ -134,7 +134,6 @@ fi
# Excludes:
EXCLUDES=(
"--exclude=${TARGET}home/*/.bash_history"
"--exclude=${TARGET}dev/*"
"--exclude=${TARGET}var/tmp/*"
"--exclude=${TARGET}media/*"
@ -171,8 +170,10 @@ else
EXCLUDES+=("${EXCLUDES_DEFAULT_PORTAGE[@]}")
fi
if ((EXCLUDE_CONNMAN))
if ((EXCLUDE_CONFIDENTIAL))
then
EXCLUDES+=("--exclude=${TARGET}home/*/.bash_history")
EXCLUDES+=("--exclude=${TARGET}root/.bash_history")
EXCLUDES+=("--exclude=${TARGET}var/lib/connman/*")
fi

4
tests/0001.bats
View file

@ -168,8 +168,8 @@ teardown() {
assert_tar_includes test/var/log/portage/elog/.keep_sys-apps_portage-0
}
@test "/home/user/.bash_history is excluded" {
assert_tar_excludes test/home/user/.bash_history
@test "/home/user/.bash_history is included" {
assert_tar_includes test/home/user/.bash_history
}
@test "/root/.bash_history is included" {

18
tests/0005.bats
View file

@ -4,6 +4,8 @@ load test_helper
setup() {
f test/var/lib/connman/file
f test/root/.bash_history
f test/home/user/.bash_history
mkstage4.sh -c -q -t test test
}
@ -19,4 +21,20 @@ teardown() {
assert_tar_includes test/var/lib/connman/
}
@test "/home/user/.bash_history is exlucded" {
assert_tar_excludes test/home/user/.bash_history
}
@test "/home/user/ is included" {
assert_tar_includes test/home/user/
}
@test "/root/.bash_history is exlucded" {
assert_tar_excludes test/root/.bash_history
}
@test "/root/ is included" {
assert_tar_includes test/root/
}
# vim: ft=bash