From cfe0184eb44a41cd50c6b9808ea0e0615be2177f Mon Sep 17 00:00:00 2001 From: illiliti Date: Sun, 5 Jul 2020 11:11:39 +0300 Subject: [PATCH] small fixes --- hooks/luks/luks | 7 +++---- init | 16 ++++++++-------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/hooks/luks/luks b/hooks/luks/luks index b6fe6dd..dd2da96 100644 --- a/hooks/luks/luks +++ b/hooks/luks/luks @@ -27,7 +27,7 @@ IFS=,; set -- $luks_opts; unset IFS - set -C; for opt; do case "${opt%%=*}" in + for opt; do case "${opt%%=*}" in key | header) cp "${opt#*=}" "${tmpdir}/root/${opt%%=*}" chmod 400 "${tmpdir}/root/${opt%%=*}" @@ -35,8 +35,7 @@ sed "s|${opt#*=}|/root/${opt%%=*}|" \ "${tmpdir}/etc/tinyramfs/config" > "${tmpdir}/_" - cp "${tmpdir}/_" "${tmpdir}/etc/tinyramfs/config" + mv "${tmpdir}/_" "${tmpdir}/etc/tinyramfs/config" chmod 600 "${tmpdir}/etc/tinyramfs/config" - rm "${tmpdir}/_" - esac || panic; done; set +C + esac || panic; done } diff --git a/init b/init index 4cf3805..2d79d8b 100755 --- a/init +++ b/init @@ -75,14 +75,14 @@ parse_cmdline() { read -r cmdline < /proc/cmdline - for line in $cmdline; do case "$line" in - rootfstype=*) root_type="${line#*=}" ;; - rootflags=*) root_opts="${line#*=}" ;; - debug=1) set -x ;; - ro | rw) rorw="-o $line" ;; - --*) init_args="${cmdline#*-- }"; break ;; - *=*) command export "$line" ;; - *) command export "${line}=1" ;; + for line in $cmdline; do case "$line" in + rootfstype=*) root_type="${line#*=}" ;; + rootflags=*) root_opts="${line#*=}" ;; + debug=1) set -x ;; + ro | rw) rorw="-o $line" ;; + --*) init_args="${cmdline#*-- }"; break ;; + *=*) command export "$line" ;; + *) command export "${line}=1" ;; esac 2> /dev/null || :; done }