From 85d243ff5836fc17416c65dca8a9e8b4e9d915bc Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Sat, 18 Jun 2011 18:38:58 -0300 Subject: [archiso] Use dm-snapshot instead of aufs2 (A.K.A. "The Big Commit") * Use device mapper + snapshot module, instead union layer filesystem. * A block-level approach vs vfs-level. * No more unofficial (Linux) things. * More memory is needed. * Refactor mkarchiso. * Refactor hooks/archiso. * Fix install/archiso_pxe_nbd (due recent change in mkinitcpio-0.6.15 on checked_modules()/all_modules()) [Thanks Dave for the improved workaround] * New configs/releng to build official images. * Works with a Bash script instead of Makefile. (better control and easy to maintain) * Remove configs/syslinux-iso. * Remove archiso2dual script. Integrate functionality in configs/releng. * New configs/baseline to build the most basic live medium or use as template. * New README (draft). [Thanks Dieter for fixing english grammar] Signed-off-by: Gerardo Exequiel Pozzi --- configs/syslinux-iso/Makefile | 94 --------------------- configs/syslinux-iso/boot-files/releasenotes.txt | 3 - configs/syslinux-iso/boot-files/splash.png | Bin 45400 -> 0 bytes .../syslinux-iso/boot-files/syslinux/syslinux.cfg | 69 --------------- configs/syslinux-iso/download-repo.sh | 66 --------------- configs/syslinux-iso/instructions | 36 -------- configs/syslinux-iso/isomounts | 12 --- configs/syslinux-iso/mkinitcpio.conf | 6 -- configs/syslinux-iso/overlay/arch/report-issues | 1 - configs/syslinux-iso/overlay/arch/setup | 3 - configs/syslinux-iso/overlay/etc/arch-release | 1 - configs/syslinux-iso/overlay/etc/archiso/functions | 20 ----- configs/syslinux-iso/overlay/etc/fstab | 5 -- configs/syslinux-iso/overlay/etc/hosts | 8 -- configs/syslinux-iso/overlay/etc/inittab | 48 ----------- configs/syslinux-iso/overlay/etc/issue | 5 -- configs/syslinux-iso/overlay/etc/motd | 16 ---- configs/syslinux-iso/overlay/etc/pacman.conf | 80 ------------------ configs/syslinux-iso/overlay/etc/pam.d/su | 6 -- configs/syslinux-iso/overlay/etc/rc.conf | 36 -------- configs/syslinux-iso/overlay/etc/rc.d/archiso | 57 ------------- .../overlay/etc/rc.d/functions.d/automated_script | 25 ------ configs/syslinux-iso/overlay/etc/sudoers | 2 - configs/syslinux-iso/overlay/usr/bin/autologin | 2 - configs/syslinux-iso/overlay/usr/bin/km | 2 - configs/syslinux-iso/packages.i686 | 46 ---------- configs/syslinux-iso/packages.x86_64 | 46 ---------- 27 files changed, 695 deletions(-) delete mode 100644 configs/syslinux-iso/Makefile delete mode 100644 configs/syslinux-iso/boot-files/releasenotes.txt delete mode 100644 configs/syslinux-iso/boot-files/splash.png delete mode 100644 configs/syslinux-iso/boot-files/syslinux/syslinux.cfg delete mode 100755 configs/syslinux-iso/download-repo.sh delete mode 100644 configs/syslinux-iso/instructions delete mode 100644 configs/syslinux-iso/isomounts delete mode 100644 configs/syslinux-iso/mkinitcpio.conf delete mode 100755 configs/syslinux-iso/overlay/arch/report-issues delete mode 100755 configs/syslinux-iso/overlay/arch/setup delete mode 100644 configs/syslinux-iso/overlay/etc/arch-release delete mode 100644 configs/syslinux-iso/overlay/etc/archiso/functions delete mode 100644 configs/syslinux-iso/overlay/etc/fstab delete mode 100644 configs/syslinux-iso/overlay/etc/hosts delete mode 100644 configs/syslinux-iso/overlay/etc/inittab delete mode 100644 configs/syslinux-iso/overlay/etc/issue delete mode 100644 configs/syslinux-iso/overlay/etc/motd delete mode 100644 configs/syslinux-iso/overlay/etc/pacman.conf delete mode 100644 configs/syslinux-iso/overlay/etc/pam.d/su delete mode 100644 configs/syslinux-iso/overlay/etc/rc.conf delete mode 100755 configs/syslinux-iso/overlay/etc/rc.d/archiso delete mode 100644 configs/syslinux-iso/overlay/etc/rc.d/functions.d/automated_script delete mode 100644 configs/syslinux-iso/overlay/etc/sudoers delete mode 100755 configs/syslinux-iso/overlay/usr/bin/autologin delete mode 100755 configs/syslinux-iso/overlay/usr/bin/km delete mode 100644 configs/syslinux-iso/packages.i686 delete mode 100644 configs/syslinux-iso/packages.x86_64 (limited to 'configs/syslinux-iso') diff --git a/configs/syslinux-iso/Makefile b/configs/syslinux-iso/Makefile deleted file mode 100644 index 441917e..0000000 --- a/configs/syslinux-iso/Makefile +++ /dev/null @@ -1,94 +0,0 @@ -ver=$(shell date +%Y.%m.%d) - -WORKDIR=work -INSTALL_DIR=arch -COMPRESS=xz - -ARCH?=$(shell uname -m) - -PWD=$(shell pwd) -NETname=$(PWD)/archlinux-$(ver)-netinstall-$(ARCH).iso -COREname=$(PWD)/archlinux-$(ver)-core-$(ARCH).iso - -PACKAGES="$(shell cat packages.$(ARCH))" - -kver_FILE=$(WORKDIR)/root-image/etc/mkinitcpio.d/kernel26.kver - -all: net-iso core-iso - -# Rules for each type of image -core-iso: $(COREname) -net-iso: $(NETname) - -$(COREname): core-pkgs base-fs - mkarchiso -D $(INSTALL_DIR) -c $(COMPRESS) iso $(WORKDIR) $@ -$(NETname): base-fs - mkarchiso -D $(INSTALL_DIR) -c $(COMPRESS) iso $(WORKDIR) $@ - -# This is the main rule for make the working filesystem. -base-fs: root-image bootfiles initcpio overlay iso-mounts - - -# Rules for make the root-image for base filesystem. -root-image: $(WORKDIR)/root-image/.arch-chroot -$(WORKDIR)/root-image/.arch-chroot: - mkarchiso -D $(INSTALL_DIR) -p base create $(WORKDIR) - mkarchiso -D $(INSTALL_DIR) -p $(PACKAGES) create $(WORKDIR) - -# Rule for make /boot -bootfiles: root-image - mkdir -p $(WORKDIR)/iso/$(INSTALL_DIR)/boot/$(ARCH) - cp $(WORKDIR)/root-image/boot/System.map26 $(WORKDIR)/iso/$(INSTALL_DIR)/boot/$(ARCH)/ - cp $(WORKDIR)/root-image/boot/vmlinuz26 $(WORKDIR)/iso/$(INSTALL_DIR)/boot/$(ARCH)/ - cp $(WORKDIR)/root-image/boot/memtest86+/memtest.bin $(WORKDIR)/iso/$(INSTALL_DIR)/boot/memtest - cp $(WORKDIR)/root-image/usr/share/licenses/common/GPL2/license.txt $(WORKDIR)/iso/$(INSTALL_DIR)/boot/memtest.COPYING - cp boot-files/splash.png $(WORKDIR)/iso/$(INSTALL_DIR)/boot/ - mkdir -p $(WORKDIR)/iso/syslinux - cp $(WORKDIR)/root-image/usr/lib/syslinux/*.c32 $(WORKDIR)/iso/syslinux/ - cp $(WORKDIR)/root-image/usr/lib/syslinux/poweroff.com $(WORKDIR)/iso/syslinux/ - cp $(WORKDIR)/root-image/usr/lib/syslinux/isolinux.bin $(WORKDIR)/iso/syslinux/ - cp $(WORKDIR)/root-image/usr/lib/syslinux/memdisk $(WORKDIR)/iso/syslinux/ - cp $(WORKDIR)/root-image/usr/lib/syslinux/pxelinux.0 $(WORKDIR)/iso/syslinux/ - cp $(WORKDIR)/root-image/usr/lib/syslinux/gpxelinux.0 $(WORKDIR)/iso/syslinux/ - cp boot-files/syslinux/syslinux.cfg $(WORKDIR)/iso/syslinux/syslinux.cfg - # Add pci.ids and modules.alias for hdt - mkdir -p $(WORKDIR)/iso/syslinux/hdt/ - wget -O - http://pciids.sourceforge.net/v2.2/pci.ids | gzip -9 > $(WORKDIR)/iso/syslinux/hdt/pciids.gz - cat $(WORKDIR)/root-image/lib/modules/$(shell grep ^ALL_kver $(kver_FILE) | cut -d= -f2)/modules.alias | gzip -9 > $(WORKDIR)/iso/syslinux/hdt/modalias.gz - -# Rules for initcpio images -initcpio: $(WORKDIR)/iso/$(INSTALL_DIR)/boot/$(ARCH)/archiso.img -$(WORKDIR)/iso/$(INSTALL_DIR)/boot/$(ARCH)/archiso.img: mkinitcpio.conf $(WORKDIR)/root-image/.arch-chroot - mkdir -p $(WORKDIR)/iso/$(INSTALL_DIR)/boot/$(ARCH)/ - mkinitcpio -c ./mkinitcpio.conf -b $(WORKDIR)/root-image -k $(shell grep ^ALL_kver $(kver_FILE) | cut -d= -f2) -g $@ - - -# overlay filesystem -overlay: - mkdir -p $(WORKDIR)/overlay/etc/pacman.d - cp -r overlay $(WORKDIR)/ - wget -O $(WORKDIR)/overlay/etc/pacman.d/mirrorlist http://www.archlinux.org/mirrorlist/all/ - sed -i "s/#Server/Server/g" $(WORKDIR)/overlay/etc/pacman.d/mirrorlist - - -# Rule to process isomounts file. -iso-mounts: $(WORKDIR)/iso/$(INSTALL_DIR)/isomounts -$(WORKDIR)/iso/$(INSTALL_DIR)/isomounts: isomounts root-image - sed "s|@ARCH@|$(ARCH)|g" isomounts > $@ - - -# Rule for make the [core] repo packages -core-pkgs: - ./download-repo.sh core $(WORKDIR)/core-pkgs/src/core/pkg - - -# Clean-up all work -clean: - rm -rf $(WORKDIR) $(NETname) $(COREname) - - -.PHONY: all core-iso net-iso -.PHONY: base-fs -.PHONY: root-image bootfiles initcpio overlay iso-mounts -.PHONY: core-pkgs -.PHONY: clean diff --git a/configs/syslinux-iso/boot-files/releasenotes.txt b/configs/syslinux-iso/boot-files/releasenotes.txt deleted file mode 100644 index 1c2e057..0000000 --- a/configs/syslinux-iso/boot-files/releasenotes.txt +++ /dev/null @@ -1,3 +0,0 @@ -Arch Linux Live Medium - Release Notes --------------------------- diff --git a/configs/syslinux-iso/boot-files/splash.png b/configs/syslinux-iso/boot-files/splash.png deleted file mode 100644 index 64b959a..0000000 Binary files a/configs/syslinux-iso/boot-files/splash.png and /dev/null differ diff --git a/configs/syslinux-iso/boot-files/syslinux/syslinux.cfg b/configs/syslinux-iso/boot-files/syslinux/syslinux.cfg deleted file mode 100644 index 3b75340..0000000 --- a/configs/syslinux-iso/boot-files/syslinux/syslinux.cfg +++ /dev/null @@ -1,69 +0,0 @@ -SERIAL 0 38400 -DEFAULT vesamenu.c32 -PROMPT 0 -MENU TITLE Arch Linux -MENU BACKGROUND /%INSTALL_DIR%/boot/splash.png -TIMEOUT 3000 - -MENU WIDTH 78 -MENU MARGIN 4 -MENU ROWS 5 -MENU VSHIFT 10 -MENU TIMEOUTROW 13 -MENU TABMSGROW 11 -MENU CMDLINEROW 11 -MENU HELPMSGROW 16 -MENU HELPMSGENDROW 29 - -# Refer to http://syslinux.zytor.com/wiki/index.php/Doc/menu - -MENU COLOR border 30;44 #40ffffff #a0000000 std -MENU COLOR title 1;36;44 #9033ccff #a0000000 std -MENU COLOR sel 7;37;40 #e0ffffff #20ffffff all -MENU COLOR unsel 37;44 #50ffffff #a0000000 std -MENU COLOR help 37;40 #c0ffffff #a0000000 std -MENU COLOR timeout_msg 37;40 #80ffffff #00000000 std -MENU COLOR timeout 1;37;40 #c0ffffff #00000000 std -MENU COLOR msg07 37;40 #90ffffff #a0000000 std -MENU COLOR tabmsg 31;40 #30ffffff #00000000 std - -LABEL arch -TEXT HELP -Boot the Arch Linux live medium. It allows you to install Arch Linux or -perform system maintenance. -ENDTEXT -MENU LABEL Boot Arch Linux -LINUX /%INSTALL_DIR%/boot/%ARCH%/vmlinuz26 -APPEND initrd=/%INSTALL_DIR%/boot/%ARCH%/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% rw_branch_size=75% locale=en_US.UTF-8 -# Next line should be uncommented when prepare enviroment to boot from PXE. -#IPAPPEND 3 - -LABEL existing -TEXT HELP -Boot an existing operating system. Press TAB to edit the disk and partition -number to boot. -ENDTEXT -MENU LABEL Boot existing OS -COM32 chain.c32 -APPEND hd0 0 - -# http://www.memtest.org/ -LABEL memtest -MENU LABEL Run Memtest86+ (RAM test) -LINUX /%INSTALL_DIR%/boot/memtest - -# http://hdt-project.org/ -LABEL hdt -MENU LABEL Hardware Information (HDT) -COM32 hdt.c32 -APPEND modules_alias=hdt/modalias.gz pciids=hdt/pciids.gz - -LABEL reboot -MENU LABEL Reboot -COM32 reboot.c32 - -LABEL poweroff -MENU LABEL Power Off -COMBOOT poweroff.com - -ONTIMEOUT arch diff --git a/configs/syslinux-iso/download-repo.sh b/configs/syslinux-iso/download-repo.sh deleted file mode 100755 index 255304e..0000000 --- a/configs/syslinux-iso/download-repo.sh +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/sh -# This script downloads a entire pacman repo to a dir -# using the locally configured best mirror. -# -# Copyright (c) 2009 Aaron Griffin -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -REPO="$1" -DEST="$2" - -REPO_CHANGED=n - -if [ -z "$REPO" -o -z "$DEST" ]; then - echo "usage: $(basename $0) " - exit 1 -fi - -if [ $EUID -ne 0 ]; then - echo "This script must be run as root (for pacman -Sp)" - exit 1 -fi - -[ -d "$DEST" ] || mkdir -p "$DEST" - -#update repos -/usr/bin/pacman -Sy - -#Ensure we have core/pkgname format, so we don't get crap from other repos -PKGS=$(/usr/bin/pacman -Sl $REPO | cut -d' ' -f1,2 | tr ' ' '/') - -if [ -n "$PKGS" ]; then - baseurl="" - cachedir="/var/cache/pacman/pkg" - for url in $(/usr/bin/pacman -Sdp $PKGS | grep '://'); do - baseurl="$(dirname "$url")" #save for later - pkgname="$(basename "$url")" - cachedpkg="$cachedir/$pkgname" - if [ ! -e "$DEST/$pkgname" ]; then - if [ -e "$cachedpkg" ]; then - cp -v "$cachedpkg" "$DEST/$pkgname" - REPO_CHANGED=y - else - wget -nv "$url" -O "$DEST/$pkgname" - REPO_CHANGED=y - fi - fi - done - if [ "$REPO_CHANGED" = "y" ]; then - wget -nv "$baseurl/$REPO.db" -O "$DEST/$REPO.db" - fi -else - echo "No packages to download... what'd you break?" - exit 1 -fi diff --git a/configs/syslinux-iso/instructions b/configs/syslinux-iso/instructions deleted file mode 100644 index 5998788..0000000 --- a/configs/syslinux-iso/instructions +++ /dev/null @@ -1,36 +0,0 @@ - Arch Linux - Installation and Live-CDs - ---------------------------- - -All images give you a live console environment in which you can do -a manual or automatic installation and which can be used as maintenance and rescue systems. - -All iso files can also be written to hard disks/usbkeys. - -Flavors: --------- -Netinstall images are the preferred install media for Arch Linux. -You can always get up to date packages using these media. -Core images contain a snapshot of the core repository, which makes them ideal -for offline installations when no Internet access is available -to install the base system. (you can do a netinstall with these also) - -Both come in i686, x86_64 or dual variant. The latter contains both and lets you choose -an architecture at boot. - -How to obtain and use these installation images: -------------------------------------- -Torrents are preferred (they are webseed enabled), but you can also just get the images -from an Arch mirror. - -The Official Arch Linux Install Guide gives you more info: - http://wiki.archlinux.org/index.php/Official_Arch_Linux_Install_Guide - -More info / getting in touch: ----------------------------- -http://bugs.archlinux.org/ -http://mailman.archlinux.org/mailman/listinfo/arch-releng - -Happy installing! -Happy ARCHing! -- Arch Linux Release Engineering team diff --git a/configs/syslinux-iso/isomounts b/configs/syslinux-iso/isomounts deleted file mode 100644 index 608149b..0000000 --- a/configs/syslinux-iso/isomounts +++ /dev/null @@ -1,12 +0,0 @@ -# archiso isomounts file -# img - location of image/directory to mount relative to addons directory -# arch - architecture of this image -# mount point - absolute location on the post-initrd root -# type - either 'bind' or 'squashfs' for now - -# syntax: - -# ORDER MATTERS! Files take top-down precedence. Be careful -@ARCH@/overlay.sqfs @ARCH@ / squashfs -@ARCH@/core-pkgs.sqfs @ARCH@ / squashfs -@ARCH@/root-image.sqfs @ARCH@ / squashfs diff --git a/configs/syslinux-iso/mkinitcpio.conf b/configs/syslinux-iso/mkinitcpio.conf deleted file mode 100644 index aea436d..0000000 --- a/configs/syslinux-iso/mkinitcpio.conf +++ /dev/null @@ -1,6 +0,0 @@ -# vim:set ft=sh -MODULES="" -BINARIES="" -FILES="" -HOOKS="base udev memdisk archiso archiso_pxe_nbd archiso_loop_mnt pata scsi sata usb fw pcmcia filesystems usbinput" -COMPRESSION="xz" diff --git a/configs/syslinux-iso/overlay/arch/report-issues b/configs/syslinux-iso/overlay/arch/report-issues deleted file mode 100755 index bf3b3a3..0000000 --- a/configs/syslinux-iso/overlay/arch/report-issues +++ /dev/null @@ -1 +0,0 @@ -aif-report-issues.sh diff --git a/configs/syslinux-iso/overlay/arch/setup b/configs/syslinux-iso/overlay/arch/setup deleted file mode 100755 index 908d106..0000000 --- a/configs/syslinux-iso/overlay/arch/setup +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -# -aif -p interactive -d -l diff --git a/configs/syslinux-iso/overlay/etc/arch-release b/configs/syslinux-iso/overlay/etc/arch-release deleted file mode 100644 index 153f8b2..0000000 --- a/configs/syslinux-iso/overlay/etc/arch-release +++ /dev/null @@ -1 +0,0 @@ -Arch Linux Live ISO diff --git a/configs/syslinux-iso/overlay/etc/archiso/functions b/configs/syslinux-iso/overlay/etc/archiso/functions deleted file mode 100644 index 9fffdcb..0000000 --- a/configs/syslinux-iso/overlay/etc/archiso/functions +++ /dev/null @@ -1,20 +0,0 @@ -# vim: set ft=sh: - -# kernel_cmdline -# Looks for a parameter on the kernel's boot-time command line. -# -# returns: 0 if param was found. Also prints its value if it was a K=V param. -# 1 if it was not. Also prints value passed as -# -kernel_cmdline () -{ - for param in $(/bin/cat /proc/cmdline); do - case "${param}" in - $1=*) echo "${param##*=}"; return 0 ;; - $1) return 0 ;; - *) continue ;; - esac - done - [ -n "${2}" ] && echo "${2}" - return 1 -} diff --git a/configs/syslinux-iso/overlay/etc/fstab b/configs/syslinux-iso/overlay/etc/fstab deleted file mode 100644 index 2b5f519..0000000 --- a/configs/syslinux-iso/overlay/etc/fstab +++ /dev/null @@ -1,5 +0,0 @@ -# -# /etc/fstab: static file system information -# -# -union / auto noauto 0 0 diff --git a/configs/syslinux-iso/overlay/etc/hosts b/configs/syslinux-iso/overlay/etc/hosts deleted file mode 100644 index b6f25e3..0000000 --- a/configs/syslinux-iso/overlay/etc/hosts +++ /dev/null @@ -1,8 +0,0 @@ -# -# /etc/hosts: static lookup table for host names -# - -# -127.0.0.1 localhost.localdomain localhost archiso - -# End of file diff --git a/configs/syslinux-iso/overlay/etc/inittab b/configs/syslinux-iso/overlay/etc/inittab deleted file mode 100644 index 47ea845..0000000 --- a/configs/syslinux-iso/overlay/etc/inittab +++ /dev/null @@ -1,48 +0,0 @@ -# -# /etc/inittab -# - -# Runlevels: -# 0 Halt -# 1(S) Single-user -# 2 Not used -# 3 Multi-user -# 4 Not used -# 5 X11 -# 6 Reboot - -## Only one of the following two lines can be uncommented! -# Boot to console -id:3:initdefault: -# Boot to X11 -#id:5:initdefault: - -rc::sysinit:/etc/rc.sysinit -rs:S1:wait:/etc/rc.single -rm:2345:wait:/etc/rc.multi -rh:06:wait:/etc/rc.shutdown -su:S:wait:/sbin/sulogin -p - -# -8 options fixes umlauts problem on login -c1:2345:respawn:/sbin/agetty -n -l /usr/bin/autologin -8 38400 tty1 linux -c2:2345:respawn:/sbin/agetty -8 38400 tty2 linux -c3:2345:respawn:/sbin/agetty -8 38400 tty3 linux -c4:2345:respawn:/sbin/agetty -8 38400 tty4 linux -c5:2345:respawn:/sbin/agetty -8 38400 tty5 linux -c6:2345:respawn:/sbin/agetty -8 38400 tty6 linux - -# Serial Virtual Console for KVM and others VMs -#s0:2345:respawn:/sbin/agetty -8 9600 ttyS0 linux - -# Hypervisor Virtual Console for Xen and KVM -#h0:2345:respawn:/sbin/agetty -8 38400 hvc0 linux - -ca::ctrlaltdel:/sbin/shutdown -t3 -r now - -# Example lines for starting a login manager -x:5:respawn:/usr/bin/xdm -nodaemon -#x:5:respawn:/usr/sbin/gdm -nodaemon -#x:5:respawn:/usr/bin/kdm -nodaemon -#x:5:respawn:/usr/bin/slim >/dev/null 2>&1 - -# End of file diff --git a/configs/syslinux-iso/overlay/etc/issue b/configs/syslinux-iso/overlay/etc/issue deleted file mode 100644 index ce82e88..0000000 --- a/configs/syslinux-iso/overlay/etc/issue +++ /dev/null @@ -1,5 +0,0 @@ - -Arch Linux Live ISO (\l) -\s-\r \m. -Default logins "root" and "arch" have no password. -To begin installation, login as root. diff --git a/configs/syslinux-iso/overlay/etc/motd b/configs/syslinux-iso/overlay/etc/motd deleted file mode 100644 index ddd9fbc..0000000 --- a/configs/syslinux-iso/overlay/etc/motd +++ /dev/null @@ -1,16 +0,0 @@ -************************************************************** -* To begin installation, run /arch/setup * -* You can find documentation at * -* /usr/share/aif/docs/official_installation_guide_en * -* * -* i18n: Use the 'km' utility to change your keyboard layout * -* and console font. * -* * -* If you encounter issues and want to report them or * -* seek help, run /arch/report-issues * -* * -* If you are looking to install Arch on something more * -* exotic, such as your kerosene-powered cheese grater, * -* please consult http://wiki.archlinux.org. * -* * -************************************************************** diff --git a/configs/syslinux-iso/overlay/etc/pacman.conf b/configs/syslinux-iso/overlay/etc/pacman.conf deleted file mode 100644 index 206ab23..0000000 --- a/configs/syslinux-iso/overlay/etc/pacman.conf +++ /dev/null @@ -1,80 +0,0 @@ -# -# /etc/pacman.conf -# -# See the pacman.conf(5) manpage for option and repository directives - -# -# GENERAL OPTIONS -# -[options] -# The following paths are commented out with their default values listed. -# If you wish to use different paths, uncomment and update the paths. -#RootDir = / -#DBPath = /var/lib/pacman/ -#CacheDir = /var/cache/pacman/pkg/ -#LogFile = /var/log/pacman.log -HoldPkg = pacman glibc -# If upgrades are available for these packages they will be asked for first -SyncFirst = pacman -#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u -#XferCommand = /usr/bin/curl -C - -f %u > %o -#CleanMethod = KeepInstalled -Architecture = auto - -# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup -#IgnorePkg = -#IgnoreGroup = - -#NoUpgrade = -#NoExtract = - -# Misc options (all disabled by default) -#UseSyslog -#ShowSize -#UseDelta -#TotalDownload -#CheckSpace - -# -# REPOSITORIES -# - can be defined here or included from another file -# - pacman will search repositories in the order defined here -# - local/custom mirrors can be added here or in separate files -# - repositories listed first will take precedence when packages -# have identical names, regardless of version number -# - URLs will have $repo replaced by the name of the current repo -# - URLs will have $arch replaced by the name of the architecture -# -# Repository entries are of the format: -# [repo-name] -# Server = ServerName -# Include = IncludePath -# -# The header [repo-name] is crucial - it must be present and -# uncommented to enable the repo. -# - -# The testing repositories are disabled by default. To enable, uncomment the -# repo name header and Include lines. You can add preferred servers immediately -# after the header, and they will be used before the default mirrors. - -#[testing] -#Include = /etc/pacman.d/mirrorlist - -[core] -Include = /etc/pacman.d/mirrorlist - -[extra] -Include = /etc/pacman.d/mirrorlist - -#[community-testing] -#Include = /etc/pacman.d/mirrorlist - -[community] -Include = /etc/pacman.d/mirrorlist - -# An example of a custom package repository. See the pacman manpage for -# tips on creating your own repositories. -#[custom] -#Server = file:///home/custompkgs - diff --git a/configs/syslinux-iso/overlay/etc/pam.d/su b/configs/syslinux-iso/overlay/etc/pam.d/su deleted file mode 100644 index a291042..0000000 --- a/configs/syslinux-iso/overlay/etc/pam.d/su +++ /dev/null @@ -1,6 +0,0 @@ -#%PAM-1.0 -auth sufficient pam_rootok.so -auth sufficient pam_wheel.so trust use_uid -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so diff --git a/configs/syslinux-iso/overlay/etc/rc.conf b/configs/syslinux-iso/overlay/etc/rc.conf deleted file mode 100644 index aff67e9..0000000 --- a/configs/syslinux-iso/overlay/etc/rc.conf +++ /dev/null @@ -1,36 +0,0 @@ -# -# /etc/rc.conf - Main Configuration for Arch Linux - -. /etc/archiso/functions - -LOCALE_DEFAULT="en_US.UTF-8" -DAEMON_LOCALE_DEFAULT="no" -CLOCK_DEFAULT="UTC" -TIMEZONE_DEFAULT="Canada/Pacific" -KEYMAP_DEFAULT="us" -CONSOLEFONT_DEFAULT= -CONSOLEMAP_DEFAULT= -USECOLOR_DEFAULT="yes" -VERBOSE_DEFAULT="3" - -LOCALE="$(kernel_cmdline locale ${LOCALE_DEFAULT})" -DAEMON_LOCALE="$(kernel_cmdline daemon_locale ${DAEMON_LOCALE_DEFAULT})" -HARDWARECLOCK="$(kernel_cmdline clock ${CLOCK_DEFAULT})" -TIMEZONE="$(kernel_cmdline timezone ${TIMEZONE_DEFAULT})" -KEYMAP="$(kernel_cmdline keymap ${KEYMAP_DEFAULT})" -CONSOLEFONT="$(kernel_cmdline consolefont ${CONSOLEFONT_DEFAULT})" -CONSOLEMAP="$(kernel_cmdline consolemap ${CONSOLEMAP_DEFAULT})" -USECOLOR="$(kernel_cmdline usecolor ${USECOLOR_DEFAULT})" -VERBOSE="$(kernel_cmdline verbose ${VERBOSE_DEFAULT})" - -MOD_AUTOLOAD="yes" -MODULES=() - -UDEV_TIMEOUT=30 -USEDMRAID="no" -USEBTRFS="no" -USELVM="no" - -HOSTNAME="archiso" - -DAEMONS=(hwclock syslog-ng network archiso) diff --git a/configs/syslinux-iso/overlay/etc/rc.d/archiso b/configs/syslinux-iso/overlay/etc/rc.d/archiso deleted file mode 100755 index 7f9239d..0000000 --- a/configs/syslinux-iso/overlay/etc/rc.d/archiso +++ /dev/null @@ -1,57 +0,0 @@ -# vim: set ft=sh: -. /etc/rc.conf -. /etc/rc.d/functions - -do_makeuser () -{ - stat_busy "Making the default user arch" - addgroups="audio,disk,optical,wheel" - useradd -m -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 > /dev/null - stat_done -} - -# GIT does not manage perms others thans 755 and 644, so fix here. -do_fix_perms () -{ - stat_busy "Fixing file permissions..." - chmod 440 /etc/sudoers - stat_done -} - -# If an alternate console was specified on the kernel command line, -# start agetty on it too. -do_special_console() -{ - cmdline_console="$(kernel_cmdline console)" - [ $? -ne 0 ] && return - - dev="${cmdline_console%%,*}" - args="${cmdline_console##*,}" - baud="${args%%[neo]*}" && baud="${baud:-"9600"}" - [ "x${args}" != "x${args%%r}" ] && rts="-h" - - - stat_busy "Starting agetty on console: ${cmdline_console}" - echo "${dev}" >> /etc/securetty - echo "z0:2345:respawn:/sbin/agetty ${rts} ${baud} ${dev} linux" >> /etc/inittab - /sbin/telinit q - stat_done -} - -case "$1" in - start) - do_locale_gen - do_makeuser - do_fix_perms - do_special_console - ;; -esac -exit 0 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 deleted file mode 100644 index edb8ea3..0000000 --- a/configs/syslinux-iso/overlay/etc/rc.d/functions.d/automated_script +++ /dev/null @@ -1,25 +0,0 @@ -. /etc/archiso/functions - -automated_script () -{ - script="$(kernel_cmdline script)" - if [[ -n "$script" ]]; then - stat_busy "Configuring $script" - if [[ "$script" =~ ^http:// || "$script" =~ ^ftp:// ]]; then - wget "$script" -q -O /tmp/startup_script >/dev/null - rt=$? - else - cp "$script" /tmp/startup_script - rt=$? - fi - 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 - else - stat_fail - fi - fi -} - -add_hook multi_end automated_script diff --git a/configs/syslinux-iso/overlay/etc/sudoers b/configs/syslinux-iso/overlay/etc/sudoers deleted file mode 100644 index 67b20ba..0000000 --- a/configs/syslinux-iso/overlay/etc/sudoers +++ /dev/null @@ -1,2 +0,0 @@ -root ALL=(ALL) ALL -%wheel ALL=(ALL) NOPASSWD: ALL diff --git a/configs/syslinux-iso/overlay/usr/bin/autologin b/configs/syslinux-iso/overlay/usr/bin/autologin deleted file mode 100755 index c124f9e..0000000 --- a/configs/syslinux-iso/overlay/usr/bin/autologin +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -/bin/login -f root diff --git a/configs/syslinux-iso/overlay/usr/bin/km b/configs/syslinux-iso/overlay/usr/bin/km deleted file mode 100755 index e24d780..0000000 --- a/configs/syslinux-iso/overlay/usr/bin/km +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -aif -p partial-keymap diff --git a/configs/syslinux-iso/packages.i686 b/configs/syslinux-iso/packages.i686 deleted file mode 100644 index 51085a1..0000000 --- a/configs/syslinux-iso/packages.i686 +++ /dev/null @@ -1,46 +0,0 @@ -aif -aufs2 -aufs2-util -b43-fwcutter -btrfs-progs-unstable -crda -curl -ddrescue -dhclient -dialog -dmraid -dnsutils -dosfstools -elinks -gnu-netcat -hdparm -inetutils -ipw2100-fw -ipw2200-fw -lftp -lilo -memtest86+ -ndiswrapper -ndiswrapper-utils -netcfg -nfs-utils -nilfs-utils -nmap -ntfs-3g -ntfsprogs -ntp -openssh -openvpn -parted -pptpclient -rsync -speedtouch -squashfs-tools -syslinux -tcpdump -tiacx -tiacx-firmware -wireless_tools -wpa_actiond -wpa_supplicant -zd1211-firmware diff --git a/configs/syslinux-iso/packages.x86_64 b/configs/syslinux-iso/packages.x86_64 deleted file mode 100644 index 51085a1..0000000 --- a/configs/syslinux-iso/packages.x86_64 +++ /dev/null @@ -1,46 +0,0 @@ -aif -aufs2 -aufs2-util -b43-fwcutter -btrfs-progs-unstable -crda -curl -ddrescue -dhclient -dialog -dmraid -dnsutils -dosfstools -elinks -gnu-netcat -hdparm -inetutils -ipw2100-fw -ipw2200-fw -lftp -lilo -memtest86+ -ndiswrapper -ndiswrapper-utils -netcfg -nfs-utils -nilfs-utils -nmap -ntfs-3g -ntfsprogs -ntp -openssh -openvpn -parted -pptpclient -rsync -speedtouch -squashfs-tools -syslinux -tcpdump -tiacx -tiacx-firmware -wireless_tools -wpa_actiond -wpa_supplicant -zd1211-firmware -- cgit v1.2.3-54-g00ecf