diff options
Diffstat (limited to 'configs/install-iso/overlay')
| -rw-r--r-- | configs/install-iso/overlay/etc/group | 29 | ||||
| -rw-r--r-- | configs/install-iso/overlay/etc/gshadow | 29 | ||||
| -rw-r--r-- | configs/install-iso/overlay/etc/locale.gen | 361 | ||||
| -rw-r--r-- | configs/install-iso/overlay/etc/passwd | 8 | ||||
| -rw-r--r-- | configs/install-iso/overlay/etc/rc.conf | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | configs/install-iso/overlay/etc/rc.d/archiso | 36 | ||||
| -rw-r--r-- | configs/install-iso/overlay/etc/shadow | 8 | ||||
| -rw-r--r-- | configs/install-iso/overlay/usr/lib/locale/locale-archive | bin | 1520480 -> 0 bytes |
8 files changed, 31 insertions, 442 deletions
diff --git a/configs/install-iso/overlay/etc/group b/configs/install-iso/overlay/etc/group deleted file mode 100644 index 17eeb63..0000000 --- a/configs/install-iso/overlay/etc/group +++ /dev/null @@ -1,29 +0,0 @@ -root:x:0:root -bin:x:1:root,bin,daemon -daemon:x:2:root,bin,daemon -sys:x:3:root,bin -adm:x:4:root,daemon -tty:x:5: -disk:x:6:root,arch -lp:x:7:daemon -mem:x:8: -kmem:x:9: -wheel:x:10:root,arch -ftp:x:11: -mail:x:12: -uucp:x:14: -log:x:19:root -locate:x:21: -smmsp:x:25: -http:x:33: -games:x:50: -network:x:90: -video:x:91: -audio:x:92:arch -optical:x:93:arch -floppy:x:94: -storage:x:95: -scanner:x:96: -power:x:98: -nobody:x:99: -users:x:100:arch diff --git a/configs/install-iso/overlay/etc/gshadow b/configs/install-iso/overlay/etc/gshadow deleted file mode 100644 index 18ce995..0000000 --- a/configs/install-iso/overlay/etc/gshadow +++ /dev/null @@ -1,29 +0,0 @@ -root:::root -bin:::root,bin,daemon -daemon:::root,bin,daemon -sys:::root,bin -adm:::root,daemon -tty::: -disk:::root,arch -lp:::daemon -mem::: -kmem::: -wheel:::root,arch -ftp::: -mail::: -uucp::: -log:::root -locate::: -smmsp::: -http::: -games::: -network:x:: -video:x:: -audio:::arch -optical:::arch -floppy:x:: -storage:x:: -scanner:x:: -power:x:: -nobody::: -users:::arch diff --git a/configs/install-iso/overlay/etc/locale.gen b/configs/install-iso/overlay/etc/locale.gen deleted file mode 100644 index 07c2a0c..0000000 --- a/configs/install-iso/overlay/etc/locale.gen +++ /dev/null @@ -1,361 +0,0 @@ -# Configuration file for locale-gen -# -# lists of locales that are to be generated by the locale-gen command. -# -# Each line is of the form: -# -# <locale> <charset> -# -# where <locale> is one of the locales given in /usr/share/i18n/locales -# and <charset> is one of the character sets listed in /usr/share/i18n/charmaps -# -# Examples: -# en_US ISO-8859-1 -# en_US.UTF-8 UTF-8 -# de_DE ISO-8859-1 -# de_DE@euro ISO-8859-15 -# -# The locale-gen command will generate all the locales, -# placing them in /usr/lib/locale. -# -# A list of supported locales is included in this file. -# Uncomment the ones you need. -# -#aa_DJ.UTF-8 UTF-8 -#aa_DJ ISO-8859-1 -#aa_ER UTF-8 -#aa_ER@saaho UTF-8 -#aa_ET UTF-8 -#af_ZA.UTF-8 UTF-8 -#af_ZA ISO-8859-1 -#am_ET UTF-8 -#an_ES.UTF-8 UTF-8 -#an_ES ISO-8859-15 -#ar_AE.UTF-8 UTF-8 -#ar_AE ISO-8859-6 -#ar_BH.UTF-8 UTF-8 -#ar_BH ISO-8859-6 -#ar_DZ.UTF-8 UTF-8 -#ar_DZ ISO-8859-6 -#ar_EG.UTF-8 UTF-8 -#ar_EG ISO-8859-6 -#ar_IN UTF-8 -#ar_IQ.UTF-8 UTF-8 -#ar_IQ ISO-8859-6 -#ar_JO.UTF-8 UTF-8 -#ar_JO ISO-8859-6 -#ar_KW.UTF-8 UTF-8 -#ar_KW ISO-8859-6 -#ar_LB.UTF-8 UTF-8 -#ar_LB ISO-8859-6 -#ar_LY.UTF-8 UTF-8 -#ar_LY ISO-8859-6 -#ar_MA.UTF-8 UTF-8 -#ar_MA ISO-8859-6 -#ar_OM.UTF-8 UTF-8 -#ar_OM ISO-8859-6 -#ar_QA.UTF-8 UTF-8 -#ar_QA ISO-8859-6 -#ar_SA.UTF-8 UTF-8 -#ar_SA ISO-8859-6 -#ar_SD.UTF-8 UTF-8 -#ar_SD ISO-8859-6 -#ar_SY.UTF-8 UTF-8 -#ar_SY ISO-8859-6 -#ar_TN.UTF-8 UTF-8 -#ar_TN ISO-8859-6 -#ar_YE.UTF-8 UTF-8 -#ar_YE ISO-8859-6 -#az_AZ.UTF-8 UTF-8 -#be_BY.UTF-8 UTF-8 -#be_BY CP1251 -#bg_BG.UTF-8 UTF-8 -#bg_BG CP1251 -#bn_BD UTF-8 -#bn_IN UTF-8 -#br_FR.UTF-8 UTF-8 -#br_FR ISO-8859-1 -#br_FR@euro ISO-8859-15 -#bs_BA.UTF-8 UTF-8 -#bs_BA ISO-8859-2 -#byn_ER UTF-8 -#ca_ES.UTF-8 UTF-8 -#ca_ES ISO-8859-1 -#ca_ES@euro ISO-8859-15 -#cs_CZ.UTF-8 UTF-8 -#cs_CZ ISO-8859-2 -#cy_GB.UTF-8 UTF-8 -#cy_GB ISO-8859-14 -#da_DK.UTF-8 UTF-8 -#da_DK ISO-8859-1 -#de_AT.UTF-8 UTF-8 -#de_AT ISO-8859-1 -#de_AT@euro ISO-8859-15 -#de_BE.UTF-8 UTF-8 -#de_BE ISO-8859-1 -#de_BE@euro ISO-8859-15 -#de_CH.UTF-8 UTF-8 -#de_CH ISO-8859-1 -#de_DE.UTF-8 UTF-8 -#de_DE ISO-8859-1 -#de_DE@euro ISO-8859-15 -#de_LU.UTF-8 UTF-8 -#de_LU ISO-8859-1 -#de_LU@euro ISO-8859-15 -#el_GR.UTF-8 UTF-8 -#el_GR ISO-8859-7 -#en_AU.UTF-8 UTF-8 -#en_AU ISO-8859-1 -#en_BW.UTF-8 UTF-8 -#en_BW ISO-8859-1 -#en_CA.UTF-8 UTF-8 -#en_CA ISO-8859-1 -#en_DK.UTF-8 UTF-8 -#en_DK ISO-8859-1 -#en_GB.UTF-8 UTF-8 -#en_GB ISO-8859-1 -#en_HK.UTF-8 UTF-8 -#en_HK ISO-8859-1 -#en_IE.UTF-8 UTF-8 -#en_IE ISO-8859-1 -#en_IE@euro ISO-8859-15 -#en_IN UTF-8 -#en_NZ.UTF-8 UTF-8 -#en_NZ ISO-8859-1 -#en_PH.UTF-8 UTF-8 -#en_PH ISO-8859-1 -#en_SG.UTF-8 UTF-8 -#en_SG ISO-8859-1 -en_US.UTF-8 UTF-8 -en_US ISO-8859-1 -#en_ZA.UTF-8 UTF-8 -#en_ZA ISO-8859-1 -#en_ZW.UTF-8 UTF-8 -#en_ZW ISO-8859-1 -#es_AR.UTF-8 UTF-8 -#es_AR ISO-8859-1 -#es_BO.UTF-8 UTF-8 -#es_BO ISO-8859-1 -#es_CL.UTF-8 UTF-8 -#es_CL ISO-8859-1 -#es_CO.UTF-8 UTF-8 -#es_CO ISO-8859-1 -#es_CR.UTF-8 UTF-8 -#es_CR ISO-8859-1 -#es_DO.UTF-8 UTF-8 -#es_DO ISO-8859-1 -#es_EC.UTF-8 UTF-8 -#es_EC ISO-8859-1 -#es_ES.UTF-8 UTF-8 -#es_ES ISO-8859-1 -#es_ES@euro ISO-8859-15 -#es_GT.UTF-8 UTF-8 -#es_GT ISO-8859-1 -#es_HN.UTF-8 UTF-8 -#es_HN ISO-8859-1 -#es_MX.UTF-8 UTF-8 -#es_MX ISO-8859-1 -#es_NI.UTF-8 UTF-8 -#es_NI ISO-8859-1 -#es_PA.UTF-8 UTF-8 -#es_PA ISO-8859-1 -#es_PE.UTF-8 UTF-8 -#es_PE ISO-8859-1 -#es_PR.UTF-8 UTF-8 -#es_PR ISO-8859-1 -#es_PY.UTF-8 UTF-8 -#es_PY ISO-8859-1 -#es_SV.UTF-8 UTF-8 -#es_SV ISO-8859-1 -#es_US.UTF-8 UTF-8 -#es_US ISO-8859-1 -#es_UY.UTF-8 UTF-8 -#es_UY ISO-8859-1 -#es_VE.UTF-8 UTF-8 -#es_VE ISO-8859-1 -#et_EE.UTF-8 UTF-8 -#et_EE ISO-8859-1 -#et_EE.ISO-8859-15 ISO-8859-15 -#eu_ES.UTF-8 UTF-8 -#eu_ES ISO-8859-1 -#eu_ES@euro ISO-8859-15 -#fa_IR UTF-8 -#fi_FI.UTF-8 UTF-8 -#fi_FI ISO-8859-1 -#fi_FI@euro ISO-8859-15 -#fo_FO.UTF-8 UTF-8 -#fo_FO ISO-8859-1 -#fr_BE.UTF-8 UTF-8 -#fr_BE ISO-8859-1 -#fr_BE@euro ISO-8859-15 -#fr_CA.UTF-8 UTF-8 -#fr_CA ISO-8859-1 -#fr_CH.UTF-8 UTF-8 -#fr_CH ISO-8859-1 -#fr_FR.UTF-8 UTF-8 -#fr_FR ISO-8859-1 -#fr_FR@euro ISO-8859-15 -#fr_LU.UTF-8 UTF-8 -#fr_LU ISO-8859-1 -#fr_LU@euro ISO-8859-15 -#ga_IE.UTF-8 UTF-8 -#ga_IE ISO-8859-1 -#ga_IE@euro ISO-8859-15 -#gd_GB.UTF-8 UTF-8 -#gd_GB ISO-8859-15 -#gez_ER UTF-8 -#gez_ER@abegede UTF-8 -#gez_ET UTF-8 -#gez_ET@abegede UTF-8 -#gl_ES.UTF-8 UTF-8 -#gl_ES ISO-8859-1 -#gl_ES@euro ISO-8859-15 -#gu_IN UTF-8 -#gv_GB.UTF-8 UTF-8 -#gv_GB ISO-8859-1 -#he_IL.UTF-8 UTF-8 -#he_IL ISO-8859-8 -#hi_IN UTF-8 -#hr_HR.UTF-8 UTF-8 -#hr_HR ISO-8859-2 -#hu_HU.UTF-8 UTF-8 -#hu_HU ISO-8859-2 -#id_ID.UTF-8 UTF-8 -#id_ID ISO-8859-1 -#is_IS.UTF-8 UTF-8 -#is_IS ISO-8859-1 -#it_CH.UTF-8 UTF-8 -#it_CH ISO-8859-1 -#it_IT.UTF-8 UTF-8 -#it_IT ISO-8859-1 -#it_IT@euro ISO-8859-15 -#iw_IL.UTF-8 UTF-8 -#iw_IL ISO-8859-8 -#ja_JP.EUC-JP EUC-JP -#ja_JP.UTF-8 UTF-8 -#ka_GE.UTF-8 UTF-8 -#ka_GE GEORGIAN-PS -#kk_KZ.UTF-8 UTF-8 -#kk_KZ PT154 -#kl_GL.UTF-8 UTF-8 -#kl_GL ISO-8859-1 -#kn_IN UTF-8 -#ko_KR.EUC-KR EUC-KR -#ko_KR.UTF-8 UTF-8 -#kw_GB.UTF-8 UTF-8 -#kw_GB ISO-8859-1 -#lg_UG.UTF-8 UTF-8 -#lg_UG ISO-8859-10 -#lo_LA UTF-8 -#lt_LT.UTF-8 UTF-8 -#lt_LT ISO-8859-13 -#lv_LV.UTF-8 UTF-8 -#lv_LV ISO-8859-13 -#mi_NZ.UTF-8 UTF-8 -#mi_NZ ISO-8859-13 -#mk_MK.UTF-8 UTF-8 -#mk_MK ISO-8859-5 -#ml_IN UTF-8 -#mn_MN UTF-8 -#mr_IN UTF-8 -#ms_MY.UTF-8 UTF-8 -#ms_MY ISO-8859-1 -#mt_MT.UTF-8 UTF-8 -#mt_MT ISO-8859-3 -#nb_NO.UTF-8 UTF-8 -#nb_NO ISO-8859-1 -#ne_NP UTF-8 -#nl_BE.UTF-8 UTF-8 -#nl_BE ISO-8859-1 -#nl_BE@euro ISO-8859-15 -#nl_NL.UTF-8 UTF-8 -#nl_NL ISO-8859-1 -#nl_NL@euro ISO-8859-15 -#nn_NO.UTF-8 UTF-8 -#nn_NO ISO-8859-1 -#oc_FR.UTF-8 UTF-8 -#oc_FR ISO-8859-1 -#om_ET UTF-8 -#om_KE.UTF-8 UTF-8 -#om_KE ISO-8859-1 -#pa_IN UTF-8 -#pl_PL.UTF-8 UTF-8 -#pl_PL ISO-8859-2 -#pt_BR.UTF-8 UTF-8 -#pt_BR ISO-8859-1 -#pt_PT.UTF-8 UTF-8 -#pt_PT ISO-8859-1 -#pt_PT@euro ISO-8859-15 -#ro_RO.UTF-8 UTF-8 -#ro_RO ISO-8859-2 -#ru_RU.KOI8-R KOI8-R -#ru_RU.UTF-8 UTF-8 -#ru_RU ISO-8859-5 -#ru_UA.UTF-8 UTF-8 -#ru_UA KOI8-U -#se_NO UTF-8 -#sid_ET UTF-8 -#sk_SK.UTF-8 UTF-8 -#sk_SK ISO-8859-2 -#sl_SI.UTF-8 UTF-8 -#sl_SI ISO-8859-2 -#so_DJ.UTF-8 UTF-8 -#so_DJ ISO-8859-1 -#so_ET UTF-8 -#so_KE.UTF-8 UTF-8 -#so_KE ISO-8859-1 -#so_SO.UTF-8 UTF-8 -#so_SO ISO-8859-1 -#sq_AL.UTF-8 UTF-8 -#sq_AL ISO-8859-1 -#sr_CS.UTF-8 UTF-8 -#sr_CS ISO-8859-5 -#st_ZA.UTF-8 UTF-8 -#st_ZA ISO-8859-1 -#sv_FI.UTF-8 UTF-8 -#sv_FI ISO-8859-1 -#sv_FI@euro ISO-8859-15 -#sv_SE.UTF-8 UTF-8 -#sv_SE ISO-8859-1 -#ta_IN UTF-8 -#te_IN UTF-8 -#tg_TJ.UTF-8 UTF-8 -#tg_TJ KOI8-T -#th_TH.UTF-8 UTF-8 -#th_TH TIS-620 -#ti_ER UTF-8 -#ti_ET UTF-8 -#tig_ER UTF-8 -#tl_PH.UTF-8 UTF-8 -#tl_PH ISO-8859-1 -#tr_TR.UTF-8 UTF-8 -#tr_TR ISO-8859-9 -#tt_RU.UTF-8 UTF-8 -#uk_UA.UTF-8 UTF-8 -#uk_UA KOI8-U -#ur_PK UTF-8 -#uz_UZ ISO-8859-1 -#uz_UZ@cyrillic UTF-8 -#vi_VN.TCVN TCVN5712-1 -#vi_VN UTF-8 -#wa_BE ISO-8859-1 -#wa_BE@euro ISO-8859-15 -#wa_BE.UTF-8 UTF-8 -#xh_ZA.UTF-8 UTF-8 -#xh_ZA ISO-8859-1 -#yi_US.UTF-8 UTF-8 -#yi_US CP1255 -#zh_CN.GB18030 GB18030 -#zh_CN.GBK GBK -#zh_CN.UTF-8 UTF-8 -#zh_CN GB2312 -#zh_HK.UTF-8 UTF-8 -#zh_HK BIG5-HKSCS -#zh_SG.UTF-8 UTF-8 -#zh_SG.GBK GBK -#zh_SG GB2312 -#zh_TW.EUC-TW EUC-TW -#zh_TW.UTF-8 UTF-8 -#zh_TW BIG5 -#zu_ZA.UTF-8 UTF-8 -#zu_ZA ISO-8859-1 diff --git a/configs/install-iso/overlay/etc/passwd b/configs/install-iso/overlay/etc/passwd deleted file mode 100644 index 1f50bcf..0000000 --- a/configs/install-iso/overlay/etc/passwd +++ /dev/null @@ -1,8 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -bin:x:1:1:bin:/bin:/bin/false -daemon:x:2:2:daemon:/sbin:/bin/false -mail:x:8:12:mail:/var/spool/mail:/bin/false -ftp:x:14:11:ftp:/srv/ftp:/bin/false -http:x:33:33:http:/srv/http:/bin/false -nobody:x:99:99:nobody:/:/bin/false -arch:x:1000:100:users:/home/arch:/bin/bash diff --git a/configs/install-iso/overlay/etc/rc.conf b/configs/install-iso/overlay/etc/rc.conf index 6b8e434..8b1c9bc 100644 --- a/configs/install-iso/overlay/etc/rc.conf +++ b/configs/install-iso/overlay/etc/rc.conf @@ -21,5 +21,5 @@ MOD_AUTOLOAD="yes" HOSTNAME="archiso" #TODO add more auto-daemons here, especially the live-cd specific stuff -DAEMONS=(syslog-ng network) +DAEMONS=(syslog-ng network archiso) #TODO: auto-network find-disks find-user-home diff --git a/configs/install-iso/overlay/etc/rc.d/archiso b/configs/install-iso/overlay/etc/rc.d/archiso index 735c297..20c964f 100644..100755 --- a/configs/install-iso/overlay/etc/rc.d/archiso +++ b/configs/install-iso/overlay/etc/rc.d/archiso @@ -22,12 +22,12 @@ scan_mount_pts () devname="/dev/$(echo ${dev} | cut -d'/' -f3,4 | cut -d'/' -f1)" mountpt="/mnt/$(basename '${devname}')" - mkdir -p "${mountpt}" 2>/dev/null - mount ${options} "${devname}" "${mountpt}" >/dev/null 2>&1 + mkdir -p "${mountpt}" 2>/dev/null + mount ${options} "${devname}" "${mountpt}" >/dev/null 2>&1 - fstype=$(awk '{ if ($1=="${devname}") { print $3" "$4;q }}' /proc/mounts) - fstype="${fstype%%,*}" - case "${fstype%% *}" in + fstype=$(awk '{ if ($1=="${devname}") { print $3" "$4;q }}' /proc/mounts) + fstype="${fstype%%,*}" + case "${fstype%% *}" in *fat*|ntfs|*dos) options="user,exec,uid=0,gid=100,umask=00070" ;; *) options="users,defaults,exec" ;; #TODO handle 'sync' on usb devices... @@ -42,7 +42,7 @@ scan_swap () { #Archie finds a pagefile.sys for windows/dos machines... may add later stat_busy "Finding existing swap partitions" - swapdev="$(fdisk -l 2>/dev/null | grep swap | cut -d' ' -f1)" + swapdev="$(fdisk -l 2>/dev/null | grep swap | cut -d' ' -f1)" if [ -e "${swapdev}" ]; then swapon ${swapdev} echo "${swapdev} swap swap defaults 0 0 #configured by archiso" >>/etc/fstab @@ -61,3 +61,27 @@ do_homedir () done stat_done } + +do_makeuser () +{ + stat_busy "Making the default user arch" + addgroups="audio,disk,optical,wheel" + useradd -p "" -g users -G $addgroups arch + stat_done +} + +do_locale_gen () +{ + stat_busy "Generating locales..." + sed -i "s/#\(${LOCALE/[@.]*}\)/\1/" /etc/locale.gen + /usr/sbin/locale-gen + stat_done +} + +case "$1" in + start) + do_locale_gen + do_makeuser + ;; +esac +exit 0 diff --git a/configs/install-iso/overlay/etc/shadow b/configs/install-iso/overlay/etc/shadow deleted file mode 100644 index e212812..0000000 --- a/configs/install-iso/overlay/etc/shadow +++ /dev/null @@ -1,8 +0,0 @@ -root::99999:::::: -bin:x:0:::::: -daemon:x:0:::::: -mail:x:0:::::: -ftp:x:0:::::: -http:x:0:::::: -nobody:x:0:::::: -arch::12922:0:99999:7::: diff --git a/configs/install-iso/overlay/usr/lib/locale/locale-archive b/configs/install-iso/overlay/usr/lib/locale/locale-archive Binary files differdeleted file mode 100644 index 0652176..0000000 --- a/configs/install-iso/overlay/usr/lib/locale/locale-archive +++ /dev/null |