dinit: update service definitions and install paths

s6-scripts finally updated to the new s6-rc format so the live-service
needs to change its formating to match. The main advantage of this is
that there is no need to sed in artix-live and pacman-init into the
contents file during the alpm hook. Instead, the empty files can just be
installed into the directory. It's much cleaner. As an aside, a couple
of BMODE calls in the makefile were changed to FMODE since s6-rc doesn't
need any of these files to be executable.

Makefile

@@ -1,6 +1,6 @@
-VERSION = 0.14
+VERSION = 0.13.8
 
-PKG = artix-live
+PKG = live-services
 TOOLS = artools
 
 SYSCONFDIR = /etc
@@ -8,6 +8,8 @@ PREFIX ?= /usr
 BINDIR = $(PREFIX)/bin
 LIBDIR = $(PREFIX)/lib
 DATADIR = $(PREFIX)/share
+SYSUSERSDIR = $(PREFIX)/lib/sysusers.d
+LIVEUSER ?= artix
 
 HOOKSDIR = $(DATADIR)/libalpm/hooks
 SCRIPTSDIR = $(DATADIR)/libalpm/scripts
@@ -51,6 +53,12 @@ S6_PI = \
 	data/s6/pacman-init/up \
 	data/s6/pacman-init/down
 
+66_LIVE = \
+	data/66/artix-live
+
+66_PI = \
+	data/66/pacman-init
+
 DINIT_LIVE = \
 	data/dinit/artix-live
 
@@ -62,26 +70,23 @@ DINIT_PI_SCRIPT = \
 
 XDG = $(wildcard data/*.desktop)
 
-XBIN = \
+XBIN = bin/desktop-items
-	bin/desktop-items
 
-GRUB_CFG = $(wildcard data/grub/cfg/*.cfg)
+SYSUSERS = \
-
+	data/sysusers
-GRUB_TZ = $(wildcard data/grub/tz/*)
-
-GRUB_LOCALES = $(wildcard data/grub/locales/*)
 
 RM = rm -f
 M4 = m4 -P
 CHMODAW = chmod a-w
 CHMODX = chmod +x
 
-all: $(BIN) $(XBIN) $(RC) $(RUNIT_SVD) $(S6_PI) $(S6_LIVE)
+all: $(BIN) $(SYSUSERS) $(XBIN) $(RC) $(RUNIT_SVD) $(S6_PI) $(S6_LIVE)
 
 EDIT = sed -e "s|@datadir[@]|$(DATADIR)|g" \
 	-e "s|@sysconfdir[@]|$(SYSCONFDIR)|g" \
 	-e "s|@bindir[@]|$(BINDIR)|g" \
-	-e "s|@libdir[@]|$(LIBDIR)|g"
+	-e "s|@libdir[@]|$(LIBDIR)|g" \
+	-e "s|@live[@]|$(LIVEUSER)|g"
 
 %: %.in Makefile lib/util-live.sh
 	@echo "GEN $@"
@@ -92,12 +97,15 @@ EDIT = sed -e "s|@datadir[@]|$(DATADIR)|g" \
 	@bash -O extglob -n "$@"
 
 clean:
-	$(RM) $(BIN) $(XBIN) $(RC) $(RUNIT_SVD) $(S6_PI) $(S6_LIVE)
+	$(RM) $(BIN) $(SYSUSERS) $(XBIN) $(RC) $(RUNIT_SVD) $(S6_PI) $(S6_LIVE)
 
 install_base:
 	install $(DMODE) $(DESTDIR)$(BINDIR)
 	install $(BMODE) $(BIN) $(DESTDIR)$(BINDIR)
 
+	install $(DMODE) $(DESTDIR)$(SYSUSERSDIR)
+	install $(FMODE) $(SYSUSERS) $(DESTDIR)$(SYSUSERSDIR)/live-artix.conf
+
 	install $(DMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)
 	install $(FMODE) $(SHARED) $(DESTDIR)$(DATADIR)/$(TOOLS)
 
@@ -134,14 +142,20 @@ install_s6:
 	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/s6/sv/artix-live
 	install $(FMODE) $(S6_LIVE) $(DESTDIR)$(SYSCONFDIR)/s6/sv/artix-live/
 
+install_66: install_alpm
+	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/66/service
+
+	install $(FMODE) $(66_LIVE) $(DESTDIR)$(SYSCONFDIR)/66/service/artix-live
+	install $(FMODE) $(66_PI) $(DESTDIR)$(SYSCONFDIR)/66/service/pacman-init
+
 install_dinit:
-	install $(DMODE) $(DESTDIR)$(LIBDIR)/dinit
+	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/dinit.d/scripts
-	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/dinit.d/boot.d
+	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/dinit.d/live.d
 	install $(FMODE) $(DINIT_LIVE) $(DESTDIR)$(SYSCONFDIR)/dinit.d/artix-live
 	install $(FMODE) $(DINIT_PI) $(DESTDIR)$(SYSCONFDIR)/dinit.d/pacman-init
 	install $(BMODE) $(DINIT_PI_SCRIPT) $(DESTDIR)$(LIBDIR)/dinit/pacman-init
-	ln -s ../artix-live $(DESTDIR)$(SYSCONFDIR)/dinit.d/boot.d
+	ln -s ../artix-live $(DESTDIR)$(SYSCONFDIR)/dinit.d/live.d
-	ln -s ../pacman-init $(DESTDIR)$(SYSCONFDIR)/dinit.d/boot.d
+	ln -s ../pacman-init $(DESTDIR)$(SYSCONFDIR)/dinit.d/live.d
 
 install_xdg:
 	install -dm0755 $(DESTDIR)$(PREFIX)/bin
@@ -150,16 +164,6 @@ install_xdg:
 	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/skel/.config/autostart
 	install -m0755 ${XDG} $(DESTDIR)$(SYSCONFDIR)/skel/.config/autostart
 
-install_grub:
+install: install_base install_rc install_runit install_s6 install_xdg
-	install $(DMODE) $(DESTDIR)$(PREFIX)/share/grub/cfg
-	install $(FMODE) $(GRUB_CFG) $(DESTDIR)$(PREFIX)/share/grub/cfg
 
-	install $(DMODE) $(DESTDIR)$(PREFIX)/share/grub/tz
+.PHONY: install
-	install $(FMODE) $(GRUB_TZ) $(DESTDIR)$(PREFIX)/share/grub/tz
-
-	install $(DMODE) $(DESTDIR)$(PREFIX)/share/grub/locales
-	install $(FMODE) $(GRUB_LOCALES) $(DESTDIR)$(PREFIX)/share/grub/locales
-
-install: install_base install_rc install_runit install_s6 install_xdg install_grub
-
-.PHONY: install install_base install_rc install_runit install_s6 install_xdg install_grub

bin/artix-live.in

@@ -21,5 +21,3 @@ configure_accountsservice
 configure_displaymanager
 
 configure_branding
-
-remove_calamares_launcher

bin/desktop-items.in

@@ -1,48 +1,41 @@
 #!/bin/sh
 
-BINDIR=${BINDIR:-@bindir@}
-DATADIR=${DATADIR:-@datadir@}
-
 # Ensure the user directories are created, some DEs (MATE)
 # create them after autostart scripts are run
 xdg-user-dirs-update --force
 
 xdg=$(xdg-user-dir DESKTOP)
-src="${DATADIR}"/applications
+src=@datadir@/applications
 
 # if [ -f $src/org.kde.konversation.desktop ]; then
 #     install -m644 $src/org.kde.konversation.desktop \
 #     $xdg/org.kde.konversation.desktop
 # fi
 
-# if [ -f "${BINDIR}"/calamares ]; then
+if [ -f @bindir@/calamares ]; then
-#     installer='calamares.desktop'
+    installer='calamares.desktop'
-#     cp $src/$installer "$xdg/$installer"
+    cp -f $src/$installer "$xdg/"
-# fi
+    sed -i s/Icon.*=calamares/Icon=artixlinux-logo/g "$xdg"/$installer
-
+    sed -r -i "s|XAUTHCOOKIE|$XAUTHORITY|" "$xdg"/$installer
-
+    chmod +x "$xdg/$installer"
-# Use cp instead of symlinks because ugly arrows or no proper icons
-if [ -f "${BINDIR}"/calamares-config-switcher ]; then
-    launcher='calamares-config-switcher.desktop'
-    cp "$src/$launcher" "$xdg/$launcher"
-    # Cinnamon needs this
-    chmod +x "$xdg/$launcher"
 fi
 
-docs="${DATADIR}"/doc/artix
+docs=@datadir@/doc/artix
 
 for f in {Configuration,Troubleshooting}.pdf; do
-    cp $docs/$f "$xdg"/$f
+    ln -s $docs/$f "$xdg"/$f
 done
 
 if [ -d /run/openrc ]; then
-    cp $docs/OpenRC.pdf "$xdg"/OpenRC.pdf
+    ln -s $docs/OpenRC.pdf "$xdg"/OpenRC.pdf
 elif [ -d /run/runit ]; then
-    cp $docs/Runit.pdf "$xdg"/Runit.pdf
+    ln -s $docs/Runit.pdf "$xdg"/Runit.pdf
+elif [ -d /run/66 ]; then
+    ln -s $docs/Suite66.pdf "$xdg"/Suite66.pdf
 elif [ -d /run/dinit ]; then
-    cp $docs/Dinit.pdf "$xdg"/Dinit.pdf
+    ln -s $docs/Dinit.pdf "$xdg"/Dinit.pdf
 else
-    cp $docs/S6.pdf "$xdg"/S6.pdf
+    ln -s $docs/S6.pdf "$xdg"/S6.pdf
 fi
 
 echo "live session details: /var/log/artix-live.log" > "$xdg"/README.txt

data/66/artix-live

@@ -0,0 +1,8 @@
+[main]
+@type = oneshot
+@version = 0.0.1
+@description = "artix-live service"
+@user = ( root )
+
+[start]
+@execute = (artix-live)

data/66/pacman-init

@@ -0,0 +1,13 @@
+[main]
+@type = oneshot
+@description = "pacman init service"
+@version = 0.0.2
+@user = ( root )
+@extdepends = ( haveged )
+
+[start]
+@execute = (
+foreground { mkdir -p /etc/pacman.d/gnupg }
+foreground { mount -t tmpfs -o size=10M,mode=0755 tmpfs /etc/pacman.d/gnupg }
+foreground { pacman-key --init }
+foreground { pacman-key --populate artix } )

data/desktop.map

@@ -7,7 +7,7 @@ pekwm:pekwm
 enlightenment:enlightenment_start
 Lumina-DE:start-lumina-desktop
 LXDE:lxsession
-plasmax11:startplasma-x11
+plasma:startplasma-x11
 lxqt:lxqt-session
 pantheon:pantheon-session
 budgie-desktop:budgie-desktop

data/dinit/artix-live

@@ -1,7 +1,4 @@
-type       = scripted
+type      = scripted
-command    = /usr/bin/artix-live
+command   = /usr/bin/artix-live
-restart    = false
+restart   = false
-depends-on = local.target
+after     = setup
-before     = login.target
-before     = lightdm
-before     = sddm

data/dinit/pacman-init

@@ -2,5 +2,4 @@ type         = scripted
 command      = /usr/lib/dinit/pacman-init
 stop-command = /usr/bin/umount -l /etc/pacman.d/gnupg
 restart      = false
-after        = local.target
+after        = setup
-before       = login.target

data/grub/cfg/defaults.cfg

@@ -1,10 +0,0 @@
-if [ -z "${def_bootlang}" ]; then
-    def_bootlang="en_US"
-    def_keyboard="us"
-    def_timezone="UTC"
-fi
-if [ -z "${bootlang}" ]; then
-    bootlang="lang=${def_bootlang}"
-    keyboard="keytable=${def_keyboard}"
-    timezone="tz=${def_timezone}"
-fi

data/grub/cfg/grub.cfg

@@ -1,545 +0,0 @@
-insmod font
-insmod keylayouts
-insmod part_msdos
-insmod part_gpt
-
-export loaded
-export koptsok
-export disable_gfxterm
-export bootarch
-export firmware
-export firmware_found
-export from
-export fromiso
-export bootlang
-export keyboard
-export timezone
-export hwclock
-export def_bootlang
-export def_keyboard
-export def_timezone
-export menu_color_normal
-export menu_color_highlight
-export pager
-
-function menu_help {
-    check_help
-    grub_help
-}
-
-function check_help {
-    if [ -z "${koptsok}" ]; then
-        echo $"WARNING: nothing set"
-        echo $" System will use defaults"
-        echo  "  American English          utc clock                 us "$"keyboard"
-        echo ""
-    fi
-}
-
-function kopts_help {
-    echo $"Example boot command line arguments:"
-    echo $" Setup"
-    echo  "  lang=<language>_<variant> keytable=<layout>         tz=<region>/<city>"
-    echo  "  hostname=<name>           username=<name>"
-    echo $" Kernel"
-    echo  "  blacklist=<module>"
-    echo $" Video"
-    echo  "  <module>.modeset=0"
-    echo  "  radeon.modeset=0          nouveau.modeset=0         i915.modeset=0"
-    echo  "  video=VGA-1:1920x1080e    DVI-0:800x600"
-    echo ""
-}
-
-function grub_help {
-    echo $"To use the menu:"
-    echo $" press up or down to move between items"
-    echo $" press enter or right to select the item"
-    echo $" press e to edit the current item"
-    echo $" press c to go to the grub command line"
-    echo ""
-    echo $"Simply edit the first line of most menus to control them"
-    echo $"Select or edit the blank line to enter command line arguments"
-    echo ""
-}
-
-function menu_reload {
-    configfile /boot/grub/grub.cfg
-}
-
-function menu_continue {
-    echo -n $"Press Enter to continue"
-    read mcont
-}
-
-function prompt {
-    echo -n "> "
-}
-
-function is_efi {
-    if [ "${grub_platform}" = "efi" ]; then
-        return 0
-    fi
-    return 1
-}
-
-function efi_detect {
-    if is_efi ; then
-        submenu --class=find.efi --hotkey=f "Detect EFI bootloaders" {
-            efi_found=false
-
-            for efi in (*,gpt*)/efi/*/*.efi (*,gpt*)/efi/*/*/*.efi (*,gpt*)/*.efi (*,gpt*)/*/*.efi ; do
-                regexp --set=1:efi_device '^\((.*)\)/' "${efi}"
-                if [ -e "${efi}" ]; then
-                    efi_found=true
-
-                    menuentry --class=efi "${efi}" "${efi_device}" {
-                        root="${2}"
-                        chainloader "${1}"
-                    }
-                fi
-            done
-
-            if [ "${efi_found}" != true ]; then
-                menuentry --hotkey=q --class=find.none "No EFI files detected." {menu_reload}
-            else
-                menuentry --hotkey=q --class=cancel "Cancel" {menu_reload}
-            fi
-        }
-    fi
-}
-
-function memtest_detect {
-    if ! is_efi; then
-        if [ -f /boot/memtest ]; then
-            menuentry --class=memtest --hotkey=m "memtest" {linux16 /boot/$1}
-        fi
-    fi
-}
-
-function lang_setup {
-    source /boot/grub/locales/${1}
-    menu_reload
-}
-
-function lang_menu {
-    menuentry --class=lang.${ll} "lang=${ll}" "${ll}" {lang_setup "${2}"}
-}
-
-function show_timezones {
-    submenu --class=tz --hotkey=t "tz=${def_timezone}" {# set the timezone above with the editor
-        if [ -n "$1" ];then
-            if [ "$1" = "tz=${def_timezone}" ]; then
-                default=0
-                menuentry --class=cancel --hotkey=q "Cancel (${def_timezone})" {menu_reload}
-                for tt in Africa America Asia Atlantic Australia Etc Europe Pacific; do
-                    submenu --class=tz.${tt} "${tt}" {
-                        menuentry --class=cancel --hotkey=q "Cancel (${def_timezone})" {menu_reload}
-                        source "/boot/grub/tz/${1}"
-                    }
-                done
-            else
-                regexp -s newtz '^tz=(.*)' "$1"
-                if [ -z "$newtz" ]; then
-                    def_timezone="$1"
-                else
-                    def_timezone="$newtz"
-                fi
-                timezone="tz=$def_timezone"
-                menu_reload
-            fi
-        fi
-    }
-}
-
-function show_keymaps {
-    submenu --class=kbd --hotkey=k "keytable=${def_keyboard}" {# set the timezone above with the editor
-        if [ -n "$1" ]; then
-            if [ "$1" = "keytable=${def_keyboard}" ]; then
-                default=0
-                menuentry --class=cancel --hotkey=q "Cancel (${def_keyboard})" {menu_reload}
-                source /boot/grub/locales/keyboards
-            else
-                regexp -s newkey '^keytable=(.*)' "$1"
-                if [ -z "$newkey" ]; then
-                    def_keyboard="$1"
-                else
-                    def_keyboard="$newkey"
-                fi
-                keyboard="keytable=$def_keyboard"
-                menu_reload
-            fi
-        fi
-    }
-}
-
-function show_languages {
-    submenu --hotkey=l --class=lang "lang=${def_bootlang}" {# set the timezone above with the editor
-        if [ -n "$1" ]; then
-            if [ "$1" = "lang=${def_bootlang}" ]; then
-                default=0
-                menuentry --class=lang.${def_bootlang} "lang=${def_bootlang}" {menu_reload}
-                menuentry --class=lang.cs "Čeština" {lang_setup "cs_CZ"}
-                menuentry --class=lang.da "Dansk" {lang_setup "da_DK"}
-                submenu --class=lang.de "Deutsch" {
-                    for ll in de_DE de_AT de_BE de_CH de_LI de_LU; do
-                        lang_menu ${ll}
-                    done
-                }
-                submenu --class=lang.el "Ελληνικά" {
-                    for ll in el_GR el_CY; do
-                        lang_menu ${ll}
-                    done
-                }
-                submenu --class=lang.en "English" {
-                    for ll in en_US en_AG en_AU en_BW en_CA en_DK en_UK en_HK en_IE en_IN en_NG en_NZ en_PH en_SG en_ZA en_ZW; do
-                        lang_menu ${ll}
-                    done
-                }
-                submenu --class=lang.es "Español" {
-                    for ll in es_ES es_AR es_BO es_CL es_CO es_CR es_DO es_EC es_GT es_HN es_MX es_NI es_PA es_PE es_PR es_PY es_SV es_US es_UY es_VE; do
-                        lang_menu ${ll}
-                    done
-                }
-                submenu --class=lang.fr "Français" {
-                    for ll in fr_FR fr_BE fr_CA fr_CH fr_LU fr_NC; do
-                        lang_menu ${ll}
-                    done
-                }
-                submenu --class=lang.it "Italiano" {
-                    for ll in it_IT it_CH; do
-                        lang_menu ${ll}
-                    done
-                }
-                menuentry --class=lang.ja "日本語" {lang_setup "ja_JP"}
-                submenu --class=lang.nl "Nederlands" {
-                    for ll in nl_NL nl_AW nl_BE; do
-                        lang_menu ${ll}
-                    done
-                }
-                menuentry --class=lang.pl "Polski" {lang_setup "pl_PL"}
-                submenu --class=lang.pt "Português" {
-                    for ll in pt_BR pt_PT; do
-                        lang_menu ${ll}
-                    done
-                }
-                menuentry --class=lang.ro "Română" {lang_setup "ro_RO"}
-                submenu --class=lang.ru "Русский" {
-                    for ll in ru_RU ru_UA;do
-                        lang_menu ${ll}
-                    done
-                }
-                menuentry --class=lang.sr "Српски" {lang_setup "sr_RS"}
-                submenu --class=lang.zh "中文" {
-                    for ll in zh_CN zh_TW; do
-                        lang_menu ${ll}
-                    done
-                }
-            else
-                regexp -s newlang '^lang=(.*)' "$1"
-                if [ -z "$newlang" ]; then
-                    def_bootlang="$1"
-                else
-                    def_bootlang="$newlang"
-                fi
-                bootlang="lang=$def_bootlang"
-                if [ -f /boot/grub/locales/${def_bootlang} ]; then
-                    source /boot/grub/locales/${def_bootlang}
-                fi
-                menu_reload
-            fi
-        fi
-    }
-}
-
-function boot_menu {
-    if [ "${hwclock}" = "utc=yes" ]; then
-        class="utc"
-        title="utc"
-        clockset=""
-    elif [ "${timezone}${bootlang}" = "" ]; then
-        class="unset"
-        title="utc"
-        clockset=""
-    else
-        title="${def_timezone}"
-        class="tz.${def_timezone}"
-        clockset="utc=yes"
-    fi
-    min2d="$MINUTE"
-    if regexp '(^.$)' "$min2d"; then
-        min2d="0${min2d}"
-    fi
-    hour2d="$HOUR"
-    if regexp '(^.$)' "$hour2d"; then
-        hour2d="0${hour2d}"
-    fi
-    menuentry --class=tz.$class --hotkey=u "$hour2d:$min2d $title" "$clockset" {
-        hwclock="$2"
-        menu_reload
-    }
-    show_timezones
-    show_keymaps
-    show_languages
-    default=2
-}
-
-function boot_defaults {
-    source /boot/grub/defaults.cfg
-}
-
-function grub_reboot {
-    menuentry " " {true}
-    menuentry --class=reboot "Reboot!" {reboot}
-}
-
-function grub_bios_installed {
-    if ! is_efi;  then
-        menuentry "" {true}
-        menuentry --class=artix "Installed BIOS-System on $installed" {exit}
-    fi
-}
-
-function grub_efi_installed {
-    if is_efi; then
-        menu "" {true}
-        menu --class=artix "Installed EFI-System on $installed" {exit}
-    fi
-}
-
-
-function check {
-    cliname="$1"
-    varname="$2"
-    if [ "${optname}" != "${cliname}" ]; then
-        return 1
-    fi
-    if [ -z "$varname" ]; then
-        varname="${cliname}"
-    fi
-    if [ -z "${optval}" ]; then
-        eval ${varname}="${cliname}"
-    else
-        eval ${varname}="${cliname}=${optval}"
-        if [ "${optname}" = "lang" ]; then
-            lang_setup ${optval}
-        elif [ "${optname}" = "keytable" ]; then
-            def_keyboard="${optval}"
-        elif [ "${optname}" = "tz" ]; then
-            def_timezone="${optval}"
-        fi
-    fi
-    return 0
-}
-
-function checkinput {
-    newinput="$1"
-    newoutput=""
-    for newcli in ${newinput} ; do
-        optname=""
-        optval=""
-        optdone=""
-        regexp -s optname '^(.+)=.*$' "${newcli}"
-        if [ -z "${optname}" ]; then
-            optname="${newcli}"
-        else
-            regexp -s optval '^.+=(.*)$' "${newcli}"
-        fi
-        for tocheck in "lang bootlang" "keytable keyboard" "tz timezone" "utc hwclock"; do
-            if check $tocheck ; then
-                optdone="Y"
-                break
-            fi
-        done
-        if [ -z "${optdone}" ]; then
-            if [ -z "${newoutput}" ]; then
-                newoutput="${newcli}"
-            else
-                newoutput="${newoutput} ${newcli}"
-            fi
-        fi
-    done
-}
-
-function new2cli {
-    newinput="$1"
-    if [ -n "$newinput" ]; then
-        checkinput "$newinput"
-        if [ -n "${newoutput}" ]; then
-            newinput="${newoutput}"
-            if [ -n "$clinput" ]; then
-                clinput="$clinput $newinput"
-            else
-                clinput="$newinput"
-            fi
-            export clinput
-        fi
-    fi
-}
-
-function getargs {
-    args=""
-    for a in $@; do
-        if [ -n "${a}" ]; then
-            args="${args} ${a}"
-        fi
-    done
-}
-
-function bootcheck {
-    getargs
-}
-
-pager=1
-
-insmod regexp
-insmod datehook
-if ! is_efi; then
-    insmod part_gpt
-fi
-
-if is_efi; then
-    insmod efi_gop
-    insmod efi_uga
-fi
-
-if [ -z "${loaded}" ]; then
-    iscd=""
-    auto=""
-    regexp -s iscd '^(cd)' "${root}"
-    if [ "${iscd}" != "cd" -a -e (cd) ]; then
-        probe -s cdp -u cd
-        probe -s hdp -u $root
-        if [ -n "$cdp" -a "$cdp" = "$hdp" ]; then
-            iscd="cd"
-        fi
-    fi
-    if [ "${root}" != "hd96" -a "${iscd}" != "cd" ]; then
-        auto="${auto}"
-    fi
-    source /boot/grub/variable.cfg
-    loaded=true
-
-    if keystatus --shift; then
-        disable_gfxterm=true
-    fi
-
-    if [ "${disable_gfxterm}" != "true" ]; then
-        if loadfont /boot/grub/unicode.pf2 ; then
-            if [ -z "$gfxmode" ] ; then
-                gfxmode=1024x768,800x600
-                gfxpayload=keep
-            fi
-            if keystatus --ctrl; then
-                gfxok=""
-                pager=0
-                while [ -z "$gfxok" ]; do
-                    echo "gfxmode=$gfxmode"
-                    echo "Input new mode or Enter to confirm"
-                    prompt
-                    read gfxmodein
-                    if [ -n "$gfxmodein" ]; then
-                        gfxmode="$gfxmodein"
-                        echo ""
-                    else
-                        gfxok="true"
-                    fi
-                done
-            fi
-            insmod all_video
-            insmod gfxterm
-            if terminal_output --append gfxterm; then
-                terminal_output --remove console
-            else
-                disable_gfxterm=true
-            fi
-        else
-            disable_gfxterm=true
-        fi
-    fi
-
-    if [ "${disable_gfxterm}" != "true"  -a -f "${grub_theme}" ]; then
-        insmod gfxmenu
-        themedir=""
-        regexp -s themedir '^(.*)/.*$' "${grub_theme}"
-        for themefont in $themedir/*.pf2 $themedir/f/*.pf2; do
-            if [ -f "${themefont}" ]; then
-                loadfont "${themefont}"
-            fi
-        done
-        for imagetype in jpg jpeg png tga; do
-            for themeimage in ${themedir}/*.${imagetype}; do
-                if [ -f "${themeimage}" ]; then
-                    if [ "${imagetype}" = "jpg" ]; then
-                        insmod jpeg
-                    else
-                        insmod $imagetype
-                    fi
-                fi
-            done
-        done
-        theme=${grub_theme}
-        export theme
-    fi
-
-    menu_color_normal=cyan/blue
-    menu_color_highlight=white/blue
-
-    if [ -n "${iso_path}" ]; then
-        auto="img_dev=/dev/disk/by-uuid/${rootuuid} img_loop=${iso_path}"
-    fi
-
-    export auto
-fi
-
-boot_defaults
-
-for kopt in "${clinput}" "${bootlang}" "${keyboard}" "${timezone}" "${hwclock}" "${auto}"; do
-    if [ -n "${kopt}" ]; then
-        kopts="${kopts} ${kopt}"
-    fi
-done
-if [ -n "${bootlang}${keyboard}${timezone}" ]; then
-    koptsok="true"
-fi
-
-boot_menu
-
-source /boot/grub/kernels.cfg
-if [ -n "$clinput" ]; then
-    menuentry --class=edit "$clinput" {
-        if [ -n "$1" ]; then
-            clinput="$@"
-        else
-            unset clinput
-        fi
-        menu_reload
-    }
-fi
-menuentry --class=type --hotkey=tab "" {# set arguments above with the editor
-    getargs $@
-    pager=0
-    if [ -z "$args" ]; then
-        check_help
-        kopts_help
-        echo $"Input command line options, press Enter to continue"
-        prompt
-        read newinput
-    else
-        newinput="$args"
-    fi
-    new2cli "$newinput"
-    pager=1
-    menu_reload
-}
-menuentry --hotkey=h --class=help "help" {
-    pager=0
-    menu_help
-    menu_continue
-    pager=1
-}
-efi_detect
-memtest_detect
-search --no-floppy --file /etc/issue --set installed
-grub_bios_installed
-grub_efi_installed
-grub_reboot

data/grub/cfg/kernels.cfg

@@ -1,40 +0,0 @@
-if cpuid -l; then
-    havekernel="Y"
-    title=""
-    for kopt in x86_64 $kopts @kopts@; do
-        if [ -n "$title" ] ; then
-            title="$title $kopt";
-        else
-            title="$kopt";
-        fi;
-    done
-    menuentry "From CD/DVD/ISO: artix.x86_64 " --class=artix.x86_64 "$title @ro_opts@" {# set arguments above with the editor
-        linux /boot/vmlinuz-$2
-        initrd /boot/intel-ucode.img /boot/amd-ucode.img /boot/initramfs-x86_64.img
-    }
-    menuentry "From Stick/HDD: artix.x86_64 " --class=artix.x86_64 "$title @rw_opts@" {# set arguments above with the editor
-        linux /boot/vmlinuz-$2
-        initrd /boot/intel-ucode.img /boot/amd-ucode.img /boot/initramfs-x86_64.img
-    }
-fi
-if [ "${havekernel}" != "Y" ]; then
-    menuentry --class=find.none "NO SUITABLE KERNELS AVAILABLE" {echo $@  echo "There are no kernels suitable for this machine available."
-        echo ""
-        if ! cpuid -l; then
-            echo "This machine is NOT 64bit capable."
-            for kk in /boot/vmlinu*x86_64; do
-                if [ "$kk" != "/boot/vmlinu*x86_64" ]; then
-                    have32="true"
-                fi
-            done
-            if [ "${have32}" != "true" ]; then
-                echo "There are no 32bit kernels available"
-                echo "It appears you are trying to boot a 64bit release on a 32bit machine"
-                echo "This cannot work!"
-            fi
-        fi
-        echo "Press Escape to return to the main menu"
-        sleep --interruptible 9999
-        menu_reload
-    }
-fi

data/grub/cfg/loopback.cfg

@@ -1 +0,0 @@
-source /boot/grub/grub.cfg

data/grub/cfg/variable.cfg

@@ -1,2 +0,0 @@
-grub_theme=/boot/grub/themes/artix/theme.txt
-timeout=-1

data/grub/locales/C_

@@ -1,9 +0,0 @@
-lang=C
-bootlang="lang=C_"
-def_bootlang="C_"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="us"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Etc/UTC"
-fi

data/grub/locales/be_BY

@@ -1,9 +0,0 @@
-lang=be
-bootlang="lang=be_BY"
-def_bootlang="be_BY"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="by"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/Minsk"
-fi

data/grub/locales/bg_BG

@@ -1,9 +0,0 @@
-lang=bg
-bootlang="lang=bg_BG"
-def_bootlang="bg_BG"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="bg"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/Sofia"
-fi

data/grub/locales/bs_BA

@@ -1,9 +0,0 @@
-lang=bs
-bootlang="lang=bs_BA"
-def_bootlang="bs_BA"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="ba"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/Sarajevo"
-fi

data/grub/locales/cs_CZ

@@ -1,9 +0,0 @@
-lang=cs
-bootlang="lang=cs_CZ"
-def_bootlang="cs_CZ"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="cz"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/Prague"
-fi

data/grub/locales/da_DK

@@ -1,9 +0,0 @@
-lang=da
-bootlang="lang=da_DK"
-def_bootlang="da_DK"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="dk"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/Copenhagen"
-fi

data/grub/locales/de_AT

@@ -1,9 +0,0 @@
-lang=de
-bootlang="lang=de_AT"
-def_bootlang="de_AT"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="de"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/Vienna"
-fi

data/grub/locales/de_BE

@@ -1,9 +0,0 @@
-lang=de
-bootlang="lang=de_BE"
-def_bootlang="de_BE"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="be"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/Brussels"
-fi

data/grub/locales/de_CH

@@ -1,9 +0,0 @@
-lang=de
-bootlang="lang=de_CH"
-def_bootlang="de_CH"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="ch"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/Zurich"
-fi

data/grub/locales/de_DE

@@ -1,9 +0,0 @@
-lang=de
-bootlang="lang=de_DE"
-def_bootlang="de_DE"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="de"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/Berlin"
-fi

data/grub/locales/de_LI

@@ -1,9 +0,0 @@
-lang=de
-bootlang="lang=de_LI"
-def_bootlang="de_LI"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="de"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/Vaduz"
-fi

data/grub/locales/de_LU

@@ -1,9 +0,0 @@
-lang=de
-bootlang="lang=de_LU"
-def_bootlang="de_LU"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="de"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/Luxembourg"
-fi

data/grub/locales/el_CY

@@ -1,9 +0,0 @@
-lang=el
-bootlang="lang=el_CY"
-def_bootlang="el_CY"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="gr"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/Athens"
-fi

data/grub/locales/el_GR

@@ -1,9 +0,0 @@
-lang=el
-bootlang="lang=el_GR"
-def_bootlang="el_GR"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="gr"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/Athens"
-fi

data/grub/locales/en_AG

@@ -1,9 +0,0 @@
-lang=en
-bootlang="lang=en_AG"
-def_bootlang="en_AG"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="us"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="America/Antigua"
-fi

data/grub/locales/en_AU

@@ -1,9 +0,0 @@
-lang=en
-bootlang="lang=en_AU"
-def_bootlang="en_AU"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="us"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Australia/Sydney"
-fi

data/grub/locales/en_BW

@@ -1,9 +0,0 @@
-lang=en
-bootlang="lang=en_BW"
-def_bootlang="en_BW"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="us"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Africa/Gaborone"
-fi

data/grub/locales/en_CA

@@ -1,9 +0,0 @@
-lang=en
-bootlang="lang=en_CA"
-def_bootlang="en_CA"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="us"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="America/Toronto"
-fi

data/grub/locales/en_DK

@@ -1,9 +0,0 @@
-lang=en
-bootlang="lang=en_DK"
-def_bootlang="en_DK"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="dk"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/Copenhagen"
-fi

data/grub/locales/en_HK

@@ -1,9 +0,0 @@
-lang=en
-bootlang="lang=en_HK"
-def_bootlang="en_HK"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="us"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Asia/Hong_Kong"
-fi

data/grub/locales/en_IE

@@ -1,9 +0,0 @@
-lang=en
-bootlang="lang=en_IE"
-def_bootlang="en_IE"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="ie"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/Dublin"
-fi

data/grub/locales/en_IN

@@ -1,9 +0,0 @@
-lang=en
-bootlang="lang=en_IN"
-def_bootlang="en_IN"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="us"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Asia/Kolkata"
-fi

data/grub/locales/en_NG

@@ -1,9 +0,0 @@
-lang=en
-bootlang="lang=en_NG"
-def_bootlang="en_NG"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="us"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Africa/Lagos"
-fi

data/grub/locales/en_NZ

@@ -1,9 +0,0 @@
-lang=en
-bootlang="lang=en_NZ"
-def_bootlang="en_NZ"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="us"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Pacific/Auckland"
-fi

data/grub/locales/en_PH

@@ -1,9 +0,0 @@
-lang=en
-bootlang="lang=en_PH"
-def_bootlang="en_PH"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="us"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Asia/Manila"
-fi

data/grub/locales/en_SG

@@ -1,9 +0,0 @@
-lang=en
-bootlang="lang=en_SG"
-def_bootlang="en_SG"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="us"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Asia/Singapore"
-fi

data/grub/locales/en_UK

@@ -1,9 +0,0 @@
-lang=en
-bootlang="lang=en_UK"
-def_bootlang="en_UK"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="uk"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/London"
-fi

data/grub/locales/en_US

@@ -1,9 +0,0 @@
-lang=en
-bootlang="lang=en_US"
-def_bootlang="en_US"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="us"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="America/New_York"
-fi

data/grub/locales/en_ZA

@@ -1,9 +0,0 @@
-lang=en
-bootlang="lang=en_ZA"
-def_bootlang="en_ZA"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="us"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Africa/Johannesburg"
-fi

data/grub/locales/en_ZW

@@ -1,9 +0,0 @@
-lang=en
-bootlang="lang=en_ZW"
-def_bootlang="en_ZW"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="us"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Africa/Harare"
-fi

data/grub/locales/es_AR

@@ -1,9 +0,0 @@
-lang=es
-bootlang="lang=es_AR"
-def_bootlang="es_AR"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="latam"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="America/Argentina/Buenos_Aires"
-fi

data/grub/locales/es_BO

@@ -1,9 +0,0 @@
-lang=es
-bootlang="lang=es_BO"
-def_bootlang="es_BO"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="latam"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="America/La_Paz"
-fi

data/grub/locales/es_CL

@@ -1,9 +0,0 @@
-lang=es
-bootlang="lang=es_CL"
-def_bootlang="es_CL"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="latam"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="America/Santiago"
-fi

data/grub/locales/es_CO

@@ -1,9 +0,0 @@
-lang=es
-bootlang="lang=es_CO"
-def_bootlang="es_CO"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="latam"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="America/Bogota"
-fi

data/grub/locales/es_CR

@@ -1,9 +0,0 @@
-lang=es
-bootlang="lang=es_CR"
-def_bootlang="es_CR"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="latam"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="America/Costa_Rica"
-fi

data/grub/locales/es_DO

@@ -1,9 +0,0 @@
-lang=es
-bootlang="lang=es_DO"
-def_bootlang="es_DO"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="latam"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="America/Santo_Domingo"
-fi

data/grub/locales/es_EC

@@ -1,9 +0,0 @@
-lang=es
-bootlang="lang=es_EC"
-def_bootlang="es_EC"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="latam"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="America/Guayaquil"
-fi

data/grub/locales/es_ES

@@ -1,9 +0,0 @@
-lang=es
-bootlang="lang=es_ES"
-def_bootlang="es_ES"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="es"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/Madrid"
-fi

data/grub/locales/es_GT

@@ -1,9 +0,0 @@
-lang=es
-bootlang="lang=es_GT"
-def_bootlang="es_GT"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="latam"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="America/Guatemala"
-fi

data/grub/locales/es_HN

@@ -1,9 +0,0 @@
-lang=es
-bootlang="lang=es_HN"
-def_bootlang="es_HN"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="latam"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="America/Tegucigalpa"
-fi

data/grub/locales/es_MX

@@ -1,9 +0,0 @@
-lang=es
-bootlang="lang=es_MX"
-def_bootlang="es_MX"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="latam"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="America/Mexico_City"
-fi

data/grub/locales/es_NI

@@ -1,9 +0,0 @@
-lang=es
-bootlang="lang=es_NI"
-def_bootlang="es_NI"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="latam"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="America/Managua"
-fi

data/grub/locales/es_PA

@@ -1,9 +0,0 @@
-lang=es
-bootlang="lang=es_PA"
-def_bootlang="es_PA"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="latam"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="America/Panama"
-fi

data/grub/locales/es_PE

@@ -1,9 +0,0 @@
-lang=es
-bootlang="lang=es_PE"
-def_bootlang="es_PE"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="latam"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="America/Lima"
-fi

data/grub/locales/es_PR

@@ -1,9 +0,0 @@
-lang=es
-bootlang="lang=es_PR"
-def_bootlang="es_PR"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="latam"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="America/Puerto_Rico"
-fi

data/grub/locales/es_PY

@@ -1,9 +0,0 @@
-lang=es
-bootlang="lang=es_PY"
-def_bootlang="es_PY"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="latam"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="America/Asuncion"
-fi

data/grub/locales/es_SV

@@ -1,9 +0,0 @@
-lang=es
-bootlang="lang=es_SV"
-def_bootlang="es_SV"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="latam"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="America/El_Salvador"
-fi

data/grub/locales/es_US

@@ -1,9 +0,0 @@
-lang=es
-bootlang="lang=es_US"
-def_bootlang="es_US"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="latam"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="America/New_York"
-fi

data/grub/locales/es_UY

@@ -1,9 +0,0 @@
-lang=es
-bootlang="lang=es_UY"
-def_bootlang="es_UY"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="latam"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="America/Montevideo"
-fi

data/grub/locales/es_VE

@@ -1,9 +0,0 @@
-lang=es
-bootlang="lang=es_VE"
-def_bootlang="es_VE"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="latam"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="America/Caracas"
-fi

data/grub/locales/et_EE

@@ -1,9 +0,0 @@
-lang=et
-bootlang="lang=et_EE"
-def_bootlang="et_EE"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="et"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/Tallinn"
-fi

data/grub/locales/fi_FI

@@ -1,9 +0,0 @@
-lang=fi
-bootlang="lang=fi_FI"
-def_bootlang="fi_FI"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="fi"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/Helsinki"
-fi

data/grub/locales/fr_BE

@@ -1,9 +0,0 @@
-lang=fr
-bootlang="lang=fr_BE"
-def_bootlang="fr_BE"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="be"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/Brussels"
-fi

data/grub/locales/fr_CA

@@ -1,9 +0,0 @@
-lang=fr
-bootlang="lang=fr_CA"
-def_bootlang="fr_CA"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="ca"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="America/Toronto"
-fi

data/grub/locales/fr_CH

@@ -1,9 +0,0 @@
-lang=fr
-bootlang="lang=fr_CH"
-def_bootlang="fr_CH"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="ch"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/Zurich"
-fi

data/grub/locales/fr_FR

@@ -1,9 +0,0 @@
-lang=fr
-bootlang="lang=fr_FR"
-def_bootlang="fr_FR"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="fr"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/Paris"
-fi

data/grub/locales/fr_LU

@@ -1,9 +0,0 @@
-lang=fr
-bootlang="lang=fr_LU"
-def_bootlang="fr_LU"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="fr"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/Luxembourg"
-fi

data/grub/locales/fr_NC

@@ -1,9 +0,0 @@
-lang=fr
-bootlang="lang=fr_NC"
-def_bootlang="fr_NC"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="fr"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Pacific/Noumea"
-fi

data/grub/locales/ga_IE

@@ -1,9 +0,0 @@
-lang=ga
-bootlang="lang=ga_IE"
-def_bootlang="ga_IE"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="ie"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/Dublin"
-fi

data/grub/locales/he_IL

@@ -1,9 +0,0 @@
-lang=he
-bootlang="lang=he_IL"
-def_bootlang="he_IL"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="il"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Asia/Jerusalem"
-fi

data/grub/locales/hr_HR

@@ -1,9 +0,0 @@
-lang=hr
-bootlang="lang=hr_HR"
-def_bootlang="hr_HR"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="hr"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/Zagreb"
-fi

data/grub/locales/hu_HU

@@ -1,9 +0,0 @@
-lang=hu
-bootlang="lang=hu_HU"
-def_bootlang="hu_HU"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="hu"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/Budapest"
-fi

data/grub/locales/is_IS

@@ -1,9 +0,0 @@
-lang=is
-bootlang="lang=is_IS"
-def_bootlang="is_IS"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="is"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Atlantic/Reykjavik"
-fi

data/grub/locales/it_CH

@@ -1,9 +0,0 @@
-lang=it
-bootlang="lang=it_CH"
-def_bootlang="it_CH"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="it"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/Zurich"
-fi

data/grub/locales/it_IT

@@ -1,9 +0,0 @@
-lang=it
-bootlang="lang=it_IT"
-def_bootlang="it_IT"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="it"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/Rome"
-fi

data/grub/locales/ja_JP

@@ -1,9 +0,0 @@
-lang=ja
-bootlang="lang=ja_JP"
-def_bootlang="ja_JP"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="jp"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Asia/Tokyo"
-fi

data/grub/locales/keyboards

@@ -1,6 +0,0 @@
-for kk in us ba be bg br by ca ch cz de dk es et fi fr uk gr hr hu ie il is it jp kr latam no pl pt ro ru se si sk sr tr ua; do
-      menuentry "keytable=${kk}" "${kk}" {def_keyboard="${2}"
-keyboard="keytable=${2}"
-menu_reload
-}
-    done

data/grub/locales/ko_KR

@@ -1,9 +0,0 @@
-lang=ko
-bootlang="lang=ko_KR"
-def_bootlang="ko_KR"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="kr"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Asia/Seoul"
-fi

data/grub/locales/nb_NO

@@ -1,9 +0,0 @@
-lang=nb
-bootlang="lang=nb_NO"
-def_bootlang="nb_NO"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="no"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/Oslo"
-fi

data/grub/locales/nl_AW

@@ -1,9 +0,0 @@
-lang=nl
-bootlang="lang=nl_AW"
-def_bootlang="nl_AW"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="us"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="America/Aruba"
-fi

data/grub/locales/nl_BE

@@ -1,9 +0,0 @@
-lang=nl
-bootlang="lang=nl_BE"
-def_bootlang="nl_BE"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="be"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/Brussels"
-fi

data/grub/locales/nl_NL

@@ -1,9 +0,0 @@
-lang=nl
-bootlang="lang=nl_NL"
-def_bootlang="nl_NL"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="us"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/Amsterdam"
-fi

data/grub/locales/nn_NO

@@ -1,9 +0,0 @@
-lang=nn
-bootlang="lang=nn_NO"
-def_bootlang="nn_NO"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="no"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/Oslo"
-fi

data/grub/locales/pl_PL

@@ -1,9 +0,0 @@
-lang=pl
-bootlang="lang=pl_PL"
-def_bootlang="pl_PL"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="pl"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/Warsaw"
-fi

data/grub/locales/pt_BR

@@ -1,9 +0,0 @@
-lang=pt
-bootlang="lang=pt_BR"
-def_bootlang="pt_BR"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="br"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="America/Sao_Paulo"
-fi

data/grub/locales/pt_PT

@@ -1,9 +0,0 @@
-lang=pt
-bootlang="lang=pt_PT"
-def_bootlang="pt_PT"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="pt"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/Lisbon"
-fi

data/grub/locales/ro_RO

@@ -1,9 +0,0 @@
-lang=ro
-bootlang="lang=ro_RO"
-def_bootlang="ro_RO"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="ro"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/Bucharest"
-fi

data/grub/locales/ru_RU

@@ -1,9 +0,0 @@
-lang=ru
-bootlang="lang=ru_RU"
-def_bootlang="ru_RU"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="ru"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/Moscow"
-fi

data/grub/locales/ru_UA

@@ -1,9 +0,0 @@
-lang=ru
-bootlang="lang=ru_UA"
-def_bootlang="ru_UA"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="ru"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/Kiev"
-fi

data/grub/locales/se_FI

@@ -1,9 +0,0 @@
-lang=se
-bootlang="lang=se_FI"
-def_bootlang="se_FI"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="fi"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/Helsinki"
-fi

data/grub/locales/se_NO

@@ -1,9 +0,0 @@
-lang=se
-bootlang="lang=se_NO"
-def_bootlang="se_NO"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="no"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/Oslo"
-fi

data/grub/locales/se_SE

@@ -1,9 +0,0 @@
-lang=se
-bootlang="lang=se_SE"
-def_bootlang="se_SE"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="se"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/Stockholm"
-fi

data/grub/locales/sk_SK

@@ -1,9 +0,0 @@
-lang=sk
-bootlang="lang=sk_SK"
-def_bootlang="sk_SK"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="sk"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/Bratislava"
-fi

data/grub/locales/sl_SI

@@ -1,9 +0,0 @@
-lang=sl
-bootlang="lang=sl_SI"
-def_bootlang="sl_SI"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="si"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/Ljubljana"
-fi

data/grub/locales/sr_RS

@@ -1,9 +0,0 @@
-lang=sr
-bootlang="lang=sr_RS"
-def_bootlang="sr_RS"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="sr"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/Belgrade"
-fi

data/grub/locales/sv_FI

@@ -1,9 +0,0 @@
-lang=sv
-bootlang="lang=sv_FI"
-def_bootlang="sv_FI"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="se"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/Helsinki"
-fi

data/grub/locales/sv_SE

@@ -1,9 +0,0 @@
-lang=sv
-bootlang="lang=sv_SE"
-def_bootlang="sv_SE"
-if [ -z "${keyboard}" ]; then
-  def_keyboard="se"
-fi
-if [ -z "${timezone}" ]; then
-  def_timezone="Europe/Stockholm"
-fi