Adjust rc.conf for recent initscripts changes
* We use a rc.conf file loser to the upstream default. * Use the recommend config files to setup hostname, locale, timezone and console EDIT (Gerardo): Add empty FONT= and use ln -f for localtime Signed-off-by: Pierre Schmitz <pierre@archlinux.de> Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
This commit is contained in:
parent
281234509f
commit
6491e409a9
18
README
18
README
@ -145,24 +145,6 @@ INDEX
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
*** Boot parameters (only for configs/releng)
|
|
||||||
|
|
||||||
** /etc/rc.conf
|
|
||||||
|
|
||||||
By default these parameters are set by default to these values
|
|
||||||
if nothing is specified on command line.
|
|
||||||
|
|
||||||
* locale= "en_US.UTF-8"
|
|
||||||
* daemon_locale= "no"
|
|
||||||
* hardwareclock= "UTC"
|
|
||||||
* timezone= "UTC"
|
|
||||||
* keymap= "us"
|
|
||||||
* consolefont= (unset)
|
|
||||||
* consolemap= (unset)
|
|
||||||
* usecolor= "yes"
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
*** Transfer ISO image to target medium (configs/releng)
|
*** Transfer ISO image to target medium (configs/releng)
|
||||||
|
|
||||||
ISO images names consist of: archlinux-<YYYY>.<MM>.<DD>-<ARCH>.iso
|
ISO images names consist of: archlinux-<YYYY>.<MM>.<DD>-<ARCH>.iso
|
||||||
|
@ -142,6 +142,7 @@ make_customize_root_image() {
|
|||||||
if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
|
if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
|
||||||
cp -af ${script_path}/root-image ${work_dir}
|
cp -af ${script_path}/root-image ${work_dir}
|
||||||
cp -aT ${work_dir}/root-image/etc/skel/ ${work_dir}/root-image/root/
|
cp -aT ${work_dir}/root-image/etc/skel/ ${work_dir}/root-image/root/
|
||||||
|
ln -sf /usr/share/zoneinfo/UTC ${work_dir}/root-image/etc/localtime
|
||||||
chmod 750 ${work_dir}/root-image/etc/sudoers.d
|
chmod 750 ${work_dir}/root-image/etc/sudoers.d
|
||||||
chmod 440 ${work_dir}/root-image/etc/sudoers.d/g_wheel
|
chmod 440 ${work_dir}/root-image/etc/sudoers.d/g_wheel
|
||||||
mkdir -p ${work_dir}/root-image/etc/pacman.d
|
mkdir -p ${work_dir}/root-image/etc/pacman.d
|
||||||
|
1
configs/releng/root-image/etc/hostname
Normal file
1
configs/releng/root-image/etc/hostname
Normal file
@ -0,0 +1 @@
|
|||||||
|
archiso
|
1
configs/releng/root-image/etc/locale.conf
Normal file
1
configs/releng/root-image/etc/locale.conf
Normal file
@ -0,0 +1 @@
|
|||||||
|
LANG=en_US.UTF-8
|
@ -1,33 +1,23 @@
|
|||||||
#
|
|
||||||
# /etc/rc.conf - Main Configuration for Arch Linux
|
|
||||||
|
|
||||||
. /etc/archiso/functions
|
. /etc/archiso/functions
|
||||||
|
#
|
||||||
|
# /etc/rc.conf - configuration file for initscripts
|
||||||
|
#
|
||||||
|
# Most of rc.conf has been replaced by various other configuration
|
||||||
|
# files. See archlinux(7) for details.
|
||||||
|
#
|
||||||
|
# For more details on rc.conf see rc.conf(5).
|
||||||
|
#
|
||||||
|
|
||||||
LOCALE_DEFAULT="en_US.UTF-8"
|
DAEMONS=(syslog-ng haveged pacman-init)
|
||||||
DAEMON_LOCALE_DEFAULT="no"
|
|
||||||
CLOCK_DEFAULT="UTC"
|
|
||||||
TIMEZONE_DEFAULT="UTC"
|
|
||||||
KEYMAP_DEFAULT="us"
|
|
||||||
CONSOLEFONT_DEFAULT=
|
|
||||||
CONSOLEMAP_DEFAULT=
|
|
||||||
USECOLOR_DEFAULT="yes"
|
|
||||||
|
|
||||||
LOCALE="$(kernel_cmdline locale ${LOCALE_DEFAULT})"
|
# Storage
|
||||||
DAEMON_LOCALE="$(kernel_cmdline daemon_locale ${DAEMON_LOCALE_DEFAULT})"
|
#
|
||||||
HARDWARECLOCK="$(kernel_cmdline clock ${CLOCK_DEFAULT})"
|
# USEDMRAID="no"
|
||||||
TIMEZONE="$(kernel_cmdline timezone ${TIMEZONE_DEFAULT})"
|
# USELVM="no"
|
||||||
KEYMAP="$(kernel_cmdline keymap ${KEYMAP_DEFAULT})"
|
|
||||||
CONSOLEFONT="$(kernel_cmdline consolefont ${CONSOLEFONT_DEFAULT})"
|
|
||||||
CONSOLEMAP="$(kernel_cmdline consolemap ${CONSOLEMAP_DEFAULT})"
|
|
||||||
USECOLOR="$(kernel_cmdline usecolor ${USECOLOR_DEFAULT})"
|
|
||||||
|
|
||||||
MODULES=()
|
# Network
|
||||||
|
#
|
||||||
UDEV_TIMEOUT=30
|
# interface=
|
||||||
USEDMRAID="no"
|
# address=
|
||||||
USEBTRFS="no"
|
# netmask=
|
||||||
USELVM="no"
|
# gateway=
|
||||||
|
|
||||||
HOSTNAME="archiso"
|
|
||||||
|
|
||||||
DAEMONS=(hwclock syslog-ng haveged pacman-init)
|
|
||||||
|
@ -1,11 +0,0 @@
|
|||||||
prepare_locale_gen ()
|
|
||||||
{
|
|
||||||
if [[ ${LOCALE} != "en_US.UTF-8" ]]; then
|
|
||||||
stat_busy "Generating locales..."
|
|
||||||
sed -i "s/#\(${LOCALE/[@.]*}\)/\1/" /etc/locale.gen
|
|
||||||
/usr/sbin/locale-gen > /dev/null
|
|
||||||
stat_done
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
add_hook sysinit_postmount prepare_locale_gen
|
|
1
configs/releng/root-image/etc/timezone
Normal file
1
configs/releng/root-image/etc/timezone
Normal file
@ -0,0 +1 @@
|
|||||||
|
UTC
|
2
configs/releng/root-image/etc/vconsole.conf
Normal file
2
configs/releng/root-image/etc/vconsole.conf
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
KEYMAP=us
|
||||||
|
FONT=
|
Loading…
Reference in New Issue
Block a user