diff options
| -rwxr-xr-x | mkartix | 6 | ||||
| -rwxr-xr-x | mkcryptartix | 7 |
2 files changed, 8 insertions, 5 deletions
@@ -6,6 +6,10 @@ function get_cmdline { sed -r 's/[[:alnum:]]+=/\n&/g' file | awk -F= '$1=="$1"{print $2}' } +# cmdline options +TIMEZONE=$(get_cmdline tz) +KEYMAP=$(get_cmdline keytable) + DRIVE=$1 PART_PREFIX=$2 @@ -14,7 +18,6 @@ if [[ -z "${DRIVE}" ]] | [[ -z "${PART_PREFIX}" ]]; then exit 1 fi -TIMEZONE=$(get_cmdline tz) ln -sf "/usr/share/zoneinfo/${TIMEZONE}" /etc/localtime hwclock --systohc @@ -49,7 +52,6 @@ EOT sed -i 's/hostname="localhost"/hostname="artix"/' /etc/conf.d/hostname -KEYMAP=$(get_cmdline keytable) sed -i "s/keymap=\"us\"/keymap=\"${KEYMAP}\"/" /etc/conf.d/keymaps # Repositories diff --git a/mkcryptartix b/mkcryptartix index bfa21c3..653bcdc 100755 --- a/mkcryptartix +++ b/mkcryptartix @@ -6,6 +6,10 @@ function get_cmdline { sed -r 's/[[:alnum:]]+=/\n&/g' file | awk -F= '$1=="Var"{print $2}' } +# cmdline options +TIMEZONE=$(get_cmdline tz) +KEYMAP=$(get_cmdline keytable) + DRIVE=$1 PART_PREFIX=$2 @@ -14,7 +18,6 @@ if [[ -z "${DRIVE}" ]] | [[ -z "${PART_PREFIX}" ]]; then exit 1 fi -TIMEZONE=$(get_cmdline tz) ln -sf "/usr/share/zoneinfo/${TIMEZONE}" /etc/localtime hwclock --systohc @@ -93,8 +96,6 @@ userdel ckbcomp cp -p /tmp/ckbcomp-bin/pkg/ckbcomp-bin/usr/bin/ckbcomp /usr/local/bin/ckbcomp -KEYMAP=$(get_cmdline keytable) - grub-kbdcomp -o /boot/grub/keymap.gkb ${KEYMAP} (cd /boot/grub && tar cf memdisk.tar keymap.gkb) |