easthighNerd/ZFSBootMenu-Root-Install
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed options from short numbered format (i.e. '-1', '-2') to long descriptive format (i.e. '--mmdebstrap', '--sources')

Browse Source
This commit is contained in:
Jean (east-high-Nerd)
2025-11-05 14:36:12 -05:00
parent 58231de76b
commit 2139685f77
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pre-inst.sh
View File

@@ -122,9 +122,11 @@ mkdir \
/mnt/run/lock /mnt/run/lock
if [[ "${ID}" == 'elementary' ]]; then if [[ "${ID}" == 'elementary' ]]; then
"${BASEDIR}/base-elementary.sh" -1 "${baseDir}/elementary.sh" --mmdebstrap
elif [[ "${ID}" == 'debian' ]]; then elif [[ "${ID}" == 'debian' ]]; then
"${BASEDIR}/base-debian.sh" -1 "${baseDir}/debian.sh" --mmdebstrap
elif [[ "${ID}" == 'fedora' ]]; then
"${baseDir}/fedora.sh" --rsync
fi fi
printf \ printf \
@@ -134,13 +136,13 @@ printf \
"127.0.1.1\t${hostname}\n" | tee --append /mnt/etc/hosts &> /dev/null "127.0.1.1\t${hostname}\n" | tee --append /mnt/etc/hosts &> /dev/null
if [[ "${ID}" == 'debian' ]]; then if [[ "${ID}" == 'debian' ]]; then
"${BASEDIR}/base-debian.sh" -2 "${baseDir}/debian.sh" --network-interfaces
fi fi
if [[ "${ID}" == 'elementary' ]]; then if [[ "${ID}" == 'elementary' ]]; then
"${BASEDIR}/base-elementary.sh" -2 "${baseDir}/elementary.sh" --sources
elif [[ "${ID}" == 'debian' ]]; then elif [[ "${ID}" == 'debian' ]]; then
"${BASEDIR}/base-debian.sh" -3 "${baseDir}/debian.sh" --sources
fi fi
mount \ mount \
@@ -163,27 +165,27 @@ cp \
/mnt/etc/ /mnt/etc/
if [[ "${ID}" == 'fedora' ]]; then if [[ "${ID}" == 'fedora' ]]; then
"${BASEDIR}/base-fedora.sh" -2 "${baseDir}/fedora.sh" --resolv-conf
fi fi
rsync -pogAXtlHrDx \ rsync -pogAXtlHrDx \
"${BASEDIR}" \ "${baseDir}" \
/mnt /mnt
if [[ "${ID}" == 'elementary' ]]; then if [[ "${ID}" == 'elementary' ]]; then
"${BASEDIR}/base-elementary.sh" -3 "${baseDir}/elementary.sh" --skel
fi fi
# if [[ ! "${*}" = *--no-part* ]]; then # if [[ ! "${*}" = *--no-part* ]]; then
if [[ -f "/etc/zfs/keys/${HOSTNAME,,}.key" ]]; then if [[ -f "/etc/zfs/keys/${hostname,,}.key" ]]; then
cp \ cp \
/etc/zfs/keys/${HOSTNAME,,}.key \ /etc/zfs/keys/${hostname,,}.key \
/mnt/etc/zfs/keys/ /mnt/etc/zfs/keys/
fi fi
# fi # fi
if [[ "${ID}" == 'elementary' ]]; then if [[ "${ID}" == 'elementary' ]]; then
"${BASEDIR}/base-elementary.sh" -4 "${baseDir}/elementary.sh" --elementary
fi fi
printf \ printf \