harald/VerityBook
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

prepare-root.sh: add --baseoutdir

Browse source
This commit is contained in:
Harald Hoyer 2018-10-23 14:12:26 +02:00
parent 7cb2bf4028
commit 4c175b78b0
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
prepare-root.sh
View file

@ -11,6 +11,7 @@ Creates a directory with a readonly root on squashfs, a dm_verity file and an EF
--excludelist FILE The packages to install read from FILE (default: excludelist.txt) --excludelist FILE The packages to install read from FILE (default: excludelist.txt)
--releasever NUM Used Fedora release version NUM (default: $VERSION_ID) --releasever NUM Used Fedora release version NUM (default: $VERSION_ID)
--outdir DIR Creates DIR and puts all files in there (default: NAME-NUM-DATE) --outdir DIR Creates DIR and puts all files in there (default: NAME-NUM-DATE)
--baseoutdir DIR Parent directory of --outdir
--name NAME The NAME of the product (default: FedoraBook) --name NAME The NAME of the product (default: FedoraBook)
--logo FILE Uses the .bmp FILE to display as a splash screen (default: logo.bmp) --logo FILE Uses the .bmp FILE to display as a splash screen (default: logo.bmp)
--quirks LIST Source the list of quirks from the quikrs directory --quirks LIST Source the list of quirks from the quikrs directory
@ -33,6 +34,7 @@ TEMP=$(
--long pkglist: \ --long pkglist: \
--long excludelist: \ --long excludelist: \
--long outdir: \ --long outdir: \
--long baseoutdir: \
--long name: \ --long name: \
--long releasever: \ --long releasever: \
--long logo: \ --long logo: \
@ -78,6 +80,10 @@ while true; do
OUTDIR="$2" OUTDIR="$2"
shift 2; continue shift 2; continue
;; ;;
'--baseoutdir')
BASEOUTDIR="$2"
shift 2; continue
;;
'--name') '--name')
NAME="$2" NAME="$2"
shift 2; continue shift 2; continue
@ -129,7 +135,9 @@ done
NAME=${NAME:-"FedoraBook"} NAME=${NAME:-"FedoraBook"}
RELEASEVER=${RELEASEVER:-$VERSION_ID} RELEASEVER=${RELEASEVER:-$VERSION_ID}
VERSION_ID="${RELEASEVER}.$(date -u +'%Y%m%d%H%M%S')" VERSION_ID="${RELEASEVER}.$(date -u +'%Y%m%d%H%M%S')"
OUTDIR=${OUTDIR:-"${CURDIR}/${NAME}-${VERSION_ID}"} BASEOUTDIR=${BASEOUTDIR:-"$CURDIR"}
OUTDIR=${OUTDIR:+"${BASEOUTDIR}/${OUTDIR}"}
OUTDIR=${OUTDIR:-"${BASEOUTDIR}/${NAME}-${VERSION_ID}"}
CRT=${CRT:-${NAME}.crt} CRT=${CRT:-${NAME}.crt}
REPOSD=${REPOSD:-/etc/yum.repos.d} REPOSD=${REPOSD:-/etc/yum.repos.d}
STATEDIR=${STATEDIR:-"${BASEDIR}/${NAME}"} STATEDIR=${STATEDIR:-"${BASEDIR}/${NAME}"}
@ -773,7 +781,7 @@ done
chown -R "$USER" "$OUTDIR" chown -R "$USER" "$OUTDIR"
cat > "${OUTDIR%/*}/${NAME}-latest.json" <<EOF cat > "${BASEOUTDIR}/${NAME}-latest.json" <<EOF
{ {
"roothash": "$ROOT_HASH", "roothash": "$ROOT_HASH",
"rootsize": "$ROOT_SIZE", "rootsize": "$ROOT_SIZE",
@ -782,5 +790,5 @@ cat > "${OUTDIR%/*}/${NAME}-latest.json" <<EOF
} }
EOF EOF
chown "$USER" "${OUTDIR%/*}/${NAME}-latest.json" chown "$USER" "${BASEOUTDIR}/${NAME}-latest.json"
setenforce $OLD_SELINUX setenforce $OLD_SELINUX