diff options
Diffstat (limited to 'configs/releng/root-image/etc')
-rw-r--r-- | configs/releng/root-image/etc/hosts | 4 | ||||
-rw-r--r-- | configs/releng/root-image/etc/issue | 2 | ||||
-rw-r--r-- | configs/releng/root-image/etc/motd | 3 | ||||
-rw-r--r-- | configs/releng/root-image/etc/rc.conf | 4 | ||||
-rw-r--r-- | configs/releng/root-image/etc/rc.d/functions.d/automated_script | 10 | ||||
-rw-r--r-- | configs/releng/root-image/etc/rc.d/functions.d/symlink_used_block_devices | 7 |
6 files changed, 17 insertions, 13 deletions
diff --git a/configs/releng/root-image/etc/hosts b/configs/releng/root-image/etc/hosts index f26c713..ddb2a52 100644 --- a/configs/releng/root-image/etc/hosts +++ b/configs/releng/root-image/etc/hosts @@ -3,7 +3,7 @@ # #<ip-address> <hostname.domain.org> <hostname> -127.0.0.1 localhost.localdomain localhost libreiso -::1 localhost.localdomain localhost libreiso +127.0.0.1 localhost.localdomain localhost libreiso +::1 localhost.localdomain localhost libreiso # End of file diff --git a/configs/releng/root-image/etc/issue b/configs/releng/root-image/etc/issue index 2e5b032..181b704 100644 --- a/configs/releng/root-image/etc/issue +++ b/configs/releng/root-image/etc/issue @@ -2,4 +2,4 @@ Parabola GNU/Linux-libre Live ISO (\l) \s-\r \m. Default logins "root" and "libre" have no password. -To begin installation, login as root. +To begin installation, login as root diff --git a/configs/releng/root-image/etc/motd b/configs/releng/root-image/etc/motd index 0943569..af615af 100644 --- a/configs/releng/root-image/etc/motd +++ b/configs/releng/root-image/etc/motd @@ -9,7 +9,4 @@ * If you encounter issues and want to report them or * * seek help, run /libre/report-issues * * * -* If you need help please consult * -* http://wiki.parabolagnulinux.org * -* * ************************************************************** diff --git a/configs/releng/root-image/etc/rc.conf b/configs/releng/root-image/etc/rc.conf index f34f828..750f47f 100644 --- a/configs/releng/root-image/etc/rc.conf +++ b/configs/releng/root-image/etc/rc.conf @@ -1,5 +1,5 @@ # -# /etc/rc.conf - Main Configuration for Parabola GNU/Linux-libre +# /etc/rc.conf - Main Configuration for Parabola GNU/Linux-Libre . /etc/archiso/functions @@ -30,4 +30,4 @@ USELVM="no" HOSTNAME="libreiso" -DAEMONS=(hwclock syslog-ng) +DAEMONS=(hwclock metalog) diff --git a/configs/releng/root-image/etc/rc.d/functions.d/automated_script b/configs/releng/root-image/etc/rc.d/functions.d/automated_script index 7a35acb..b89ad9e 100644 --- a/configs/releng/root-image/etc/rc.d/functions.d/automated_script +++ b/configs/releng/root-image/etc/rc.d/functions.d/automated_script @@ -1,16 +1,16 @@ automated_script () { script="$(kernel_cmdline script)" - if [[ -n "$script" ]]; then + if [[ -n "${script}" ]]; then stat_busy "Configuring $script" - if [[ "$script" =~ ^http:// || "$script" =~ ^ftp:// ]]; then - wget "$script" -q -O /tmp/startup_script >/dev/null + if [[ "${script}" =~ ^http:// || "${script}" =~ ^ftp:// ]]; then + wget "${script}" -q -O /tmp/startup_script >/dev/null rt=$? else - cp "$script" /tmp/startup_script + cp "${script}" /tmp/startup_script rt=$? fi - if [ $rt -eq 0 ]; then + if [ ${rt} -eq 0 ]; then chmod +x /tmp/startup_script echo -e '\nif [ $(tty) = "/dev/tty1" ]; then\n /tmp/startup_script\nfi\n' >> /root/.bash_profile stat_done diff --git a/configs/releng/root-image/etc/rc.d/functions.d/symlink_used_block_devices b/configs/releng/root-image/etc/rc.d/functions.d/symlink_used_block_devices new file mode 100644 index 0000000..f6b6062 --- /dev/null +++ b/configs/releng/root-image/etc/rc.d/functions.d/symlink_used_block_devices @@ -0,0 +1,7 @@ +symlink_used_block_devices() +{ + mkdir /run/aif + ln -s /run/archiso/used_block_devices /run/aif/ignore_block_devices +} + +add_hook multi_end symlink_used_block_devices |