diff options
| author | Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> | 2011-05-01 17:04:11 -0300 |
|---|---|---|
| committer | Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> | 2011-05-01 17:04:11 -0300 |
| commit | a8c1c0cb6ff5a4c89a3e248f1d18917fc5e73202 (patch) | |
| tree | 2e6d1073648267648295c933afec7b4558e4a571 | |
| parent | 13193bc0ba657ddb22b1013f3ff6b786fe58445c (diff) | |
| download | archiso32-a8c1c0cb6ff5a4c89a3e248f1d18917fc5e73202.tar.xz | |
[syslinux-iso] Fix double execution of initscripts hooks.
Partially revert commit b171f8f11fdc04a22c7b8f3ff3b9dd164986daae
Fixes https://bugs.archlinux.org/task/23786
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
| -rw-r--r-- | configs/syslinux-iso/overlay/etc/archiso/functions (renamed from configs/syslinux-iso/overlay/etc/rc.d/functions.d/archiso) | 0 | ||||
| -rw-r--r-- | configs/syslinux-iso/overlay/etc/rc.conf | 2 | ||||
| -rw-r--r-- | configs/syslinux-iso/overlay/etc/rc.d/functions.d/automated_script | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/configs/syslinux-iso/overlay/etc/rc.d/functions.d/archiso b/configs/syslinux-iso/overlay/etc/archiso/functions index 02b41cf..02b41cf 100644 --- a/configs/syslinux-iso/overlay/etc/rc.d/functions.d/archiso +++ b/configs/syslinux-iso/overlay/etc/archiso/functions diff --git a/configs/syslinux-iso/overlay/etc/rc.conf b/configs/syslinux-iso/overlay/etc/rc.conf index 3ce3c5a..2819a32 100644 --- a/configs/syslinux-iso/overlay/etc/rc.conf +++ b/configs/syslinux-iso/overlay/etc/rc.conf @@ -1,7 +1,7 @@ # # /etc/rc.conf - Main Configuration for Arch Linux -. /etc/rc.d/functions +. /etc/archiso/functions LOCALE_DEFAULT="en_US.UTF-8" CLOCK_DEFAULT="" diff --git a/configs/syslinux-iso/overlay/etc/rc.d/functions.d/automated_script b/configs/syslinux-iso/overlay/etc/rc.d/functions.d/automated_script index 7a35acb..edb8ea3 100644 --- a/configs/syslinux-iso/overlay/etc/rc.d/functions.d/automated_script +++ b/configs/syslinux-iso/overlay/etc/rc.d/functions.d/automated_script @@ -1,3 +1,5 @@ +. /etc/archiso/functions + automated_script () { script="$(kernel_cmdline script)" |