Rename "default-config" to "overlay"

I like difficulty and then name was annoying me

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>

Makefile

@@ -1,28 +0,0 @@
-all:
-
-install: all
-	# install to sbin since script only usable by root
-	mkdir -p $(DESTDIR)/usr/sbin
-	install -m 755 mkarchiso $(DESTDIR)/usr/sbin
-	install -m 755 mkusbimg $(DESTDIR)/usr/sbin
-	# testiso can be used by anyone
-	mkdir -p $(DESTDIR)/usr/bin
-	install -m 755 testiso $(DESTDIR)/usr/bin
-	# hooks/install are needed by mkinitcpio
-	mkdir -p $(DESTDIR)/lib/initcpio/{hooks,install}
-	install -m 644 hooks/{archiso,boot-cd,boot-usb} $(DESTDIR)/lib/initcpio/hooks/
-	install -m 644 install/{archiso,boot-cd,boot-usb} $(DESTDIR)/lib/initcpio/install/
-	# install default config in a sane location
-	mkdir -p $(DESTDIR)/usr/share/archiso
-	install -m 644 archiso-mkinitcpio.conf $(DESTDIR)/usr/share/archiso/
-	install -m 644 packages.list $(DESTDIR)/usr/share/archiso/
-	cp -R default-config $(DESTDIR)/usr/share/archiso/
-	# cheating a bit...sudoers HAS to have certain permissions
-	chmod 0440 $(DESTDIR)/usr/share/archiso/default-config/etc/sudoers
-
-uninstall:
-	rm -f $(DESTDIR)/usr/sbin/mkarchiso
-	rm -f $(DESTDIR)/usr/bin/testiso
-	rm -f $(DESTDIR)/lib/initcpio/hooks/{archiso,boot-cd,boot-usb}
-	rm -f $(DESTDIR)/lib/initcpio/install/{archiso,boot-cd,boot-usb}
-	rm -rf $(DESTDIR)/usr/share/archiso

addon_config

@@ -1,8 +0,0 @@
-# img - location of image/directory to mount relative to addons directory
-# mount point - absolute location on the post-initrd root
-# type - either 'bind' or 'squashfs' for now
-
-# syntax: <img> <mount point> <type>
-
-core                    /packages           bind
-live_overlay.sqfs       /                   squashfs

archiso-mkinitcpio.conf

@@ -1,8 +0,0 @@
-# vim:set ft=sh
-# This file is for mkarchiso ONLY and is not to be edited by hand
-MODULES=""
-BINARIES=""
-FILES=""
-
-HOOKS="base udev boot-cd archiso ide scsi sata usb fw filesystems"
-#HOOKS="base udev boot-usb archiso ide scsi sata usb fw filesystems"

archiso/hooks/archiso

@@ -55,7 +55,7 @@ run_hook ()
     addon_dir="${BOOT_MOUNT}/addons"
 
     # always layer default configuration
-    _mnt_squashfs "${addon_dir}/default-config.sqfs"
+    _mnt_squashfs "${addon_dir}/overlay.sqfs"
 
     if [ -e "${addon_dir}/config" ]; then
         msg ":: Mounting addons"

archiso/mkarchiso

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 CPIOCONFIG="$(pwd)/archiso-mkinitcpio.conf"
-DEF_CONFIG_DIR="$(pwd)/default-config"
+DEF_CONFIG_DIR="$(pwd)/overlay"
 PKGFILE="$(pwd)/packages.list"
 PKGLIST=""
 QUIET="y"
@@ -28,8 +28,8 @@ usage ()
     echo "    -v               Enable verbose output."
     echo "    -h               This message."
     echo " commands:"
-    echo " install <working dir>        : where to build the image root"
+    echo " install <working dir>          : where to build the image root"
-    echo " squash <working dir>         : generate a squashfs image of the installed root"
+    echo " squash <working dir>           : generate a squashfs image of the installed root"
     echo " img <working dir> <image name> : build an image from the working directory"
     echo " all <working dir> <image name> : perform all of the above, in order"
     exit $1
@@ -171,11 +171,11 @@ if [ "${command_name}" = "install" -o "${command_name}" = "all" ]; then
     fi
 
     # always make an addon out of DEF_CONFIG_DIR
-    echo "Creating default-config addon..."
+    echo "Creating default overlay..."
     if [ "${QUIET}" = "y" ]; then
-        mksquashfs "${DEF_CONFIG_DIR}" "${imgroot}/addons/default-config.sqfs" -noappend >/dev/null
+        mksquashfs "${DEF_CONFIG_DIR}" "${imgroot}/addons/overlay.sqfs" -noappend >/dev/null
     else
-        mksquashfs "${DEF_CONFIG_DIR}" "${imgroot}/addons/default-config.sqfs" -noappend
+        mksquashfs "${DEF_CONFIG_DIR}" "${imgroot}/addons/overlay.sqfs" -noappend
     fi
 fi
 

gen_grubscan

@@ -1,30 +0,0 @@
-#!/bin/bash
-
-count=0
-fallback=""
-for hd in $(seq 0 3); do
-    for part in $(seq 0 17); do
-        count=$(($count + 1))
-        fallback="${fallback} ${count}"
-    done
-done
-
-echo "timeout 0"
-echo "default 0"
-echo "fallback ${fallback}"
-echo "color light-blue/blue black/light-grey"
-echo "splashimage=/boot/splash.xpm.gz"
-echo ""
-
-for hd in $(seq 0 3); do
-    for part in $(seq 0 17); do
-        echo "title Testing disk ${hd}, partition ${part}"
-        echo "set scan_dev=(hd${hd},${part})"
-        echo "fexists \$(scan_dev)/boot/grub/menu.lst"
-        echo "configfile \$(scan_dev)/boot/grub/menu.lst"
-        echo ""
-    done
-done
-
-echo "title Failed"
-echo "pause Scanning for installed grub failed"

mkarchiso

@@ -1,260 +0,0 @@
-#!/bin/bash
-
-CPIOCONFIG="$(pwd)/archiso-mkinitcpio.conf"
-DEF_CONFIG_DIR="$(pwd)/default-config"
-PKGFILE="$(pwd)/packages.list"
-PKGLIST=""
-QUIET="y"
-FORCE="n"
-ADDON_DIR=""
-
-command_name=""
-work_dir=""
-imgname=""
-
-APPNAME=$(basename "${0}")
-
-# usage: usage <exitvalue>
-usage ()
-{
-    echo "usage ${APPNAME} [options] command <command options>"
-    echo " general options:"
-    echo "    -f               Force overwrite of working files/squashfs image/bootable image"
-    echo "    -i CPIO_CONFIG   Use CONFIG file for mkinitcpio. default: ${CPIOCONFIG}"
-    echo "    -P PKGFILE       File with list of packages to install. default: ${PKGFILE}"
-    echo "    -p PACKAGE       Additional package to install, can be used multiple times"
-    echo "    -a ADDON_DIR     Use addons from DIR. default: none"
-    echo "    -t <iso,disk>    Type of image to create. Defaults to iso."
-    echo "    -v               Enable verbose output."
-    echo "    -h               This message."
-    echo " commands:"
-    echo " install <working dir>        : where to build the image root"
-    echo " squash <working dir>         : generate a squashfs image of the installed root"
-    echo " img <working dir> <image name> : build an image from the working directory"
-    echo " all <working dir> <image name> : perform all of the above, in order"
-    exit $1
-}
-
-while getopts 'i:P:p:a:t:fvh' arg; do
-    case "${arg}" in
-        i) CPIOCONFIG="${OPTARG}" ;;
-        P) PKGFILE="${OPTARG}" ;;
-        p) PKGLIST="${PKGLIST} ${OPTARG}" ;;
-        a) ADDON_DIR="${OPTARG}" ;;
-        t) IMG_TYPE="${OPTARG}" ;;
-        f) FORCE="y" ;;
-        v) QUIET="n" ;;
-        h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
-    esac
-done
-
-shift $(($OPTIND - 1))
-echo "ARGS: $@"
-
-[ $# -le 1 ] && usage 1
-
-# do UID checking here so someone can at least get usage instructions
-if [ "$EUID" != "0" ]; then
-    echo "error: This script must be run as root."
-    exit 1
-fi
-
-command_name="${1}"
-case "${command_name}" in
-    install) work_dir="${2}" ;;
-    squash) work_dir="${2}" ;;
-    img) work_dir="${2}"; imgname="${3}" ;;
-    all) work_dir="${2}"; imgname="${3}" ;;
-    *) echo "invalid command name '${command_name}'"; usage 1 ;;
-esac
-
-[ "x${work_dir}" = "x" ] && (echo "please specify a working directory" && usage 1)
-
-imgroot="${work_dir}/img"
-instroot="${work_dir}/install"
-
-_kversion ()
-{
-    source ${instroot}/etc/mkinitcpio.d/kernel26.kver
-    echo ${ALL_kver}
-}
-
-# usage: _pacman <packages>...
-_pacman ()
-{
-    local ret
-    if [ "${QUIET}" = "y" ]; then
-        mkarchroot -f ${instroot} $* 2>&1 >/dev/null
-        ret=$?
-    else
-        mkarchroot -f ${instroot} $*
-        ret=$?
-    fi
-    if [ $ret -ne 0 ]; then
-        exit 1
-    fi
-}
-
-# usage: install_pkgfile <packagesfile>
-install_pkgfile ()
-{
-    if [ -e "${1}" ]; then
-        toinstall=""
-        while read pkg; do
-            toinstall="${toinstall} ${pkg}"
-        done < ${1}
-        _pacman "${toinstall}"
-    else
-        echo "error: Package file '${1}' does not exist, aborting."
-        exit 1
-    fi
-}
-
-# Go through the main commands in order. If 'all' was specified, then we want
-# to do everything. Start with 'install'.
-if [ "${command_name}" = "install" -o "${command_name}" = "all" ]; then
-    echo "====> Installing/building image root"
-    if [ -e "${work_dir}" -a "${FORCE}" = "n" ]; then
-        echo "error: Working dir '${work_dir}' already exists, aborting."
-        exit 1
-    fi
-
-    mkdir -p "${imgroot}"
-    mkdir -p "${instroot}"
-
-    echo "Installing packages..."
-    echo " Installing packages from '${PKGFILE}'"
-    install_pkgfile "${PKGFILE}"
-
-    for pkg in ${PKGLIST}; do
-        echo "   Installing package '${pkg}'"
-        _pacman "${pkg}"
-    done
-
-    echo "Updating kernel module dependencies"
-    kernelver=$(_kversion)
-    depmod -a -b "${instroot}" "${kernelver}"
-    # remove the initcpio images that were generated for the host system
-    find "${instroot}/boot" -name *.img -delete
-
-    echo "Creating default home directory"
-    install -d -o1000 -g100 -m0755 "${instroot}/home/arch"
-
-    # Cleanup
-    echo "Cleaning up image root files..."
-    find "${instroot}" -name *.pacnew -name *.pacsave -name *.pacorig -delete
-
-    # delete a lot of unnecessary cache/log files
-    kill_dirs="var/abs var/cache/man var/cache/pacman var/log/* var/mail tmp/* initrd"
-    for x in ${kill_dirs}; do
-        if [ -e "${instroot}/${x}" ]; then
-            rm -rf "${instroot}/${x}"
-        fi
-    done
-
-    # pacman DBs are big, delete all sync dbs
-    rm -rf "${instroot}/var/lib/pacman/sync"
-
-    # copy over kernel and grub configs for boot
-    if [ -e "${instroot}/boot" -a -e "${DEF_CONFIG_DIR}/boot" ]; then
-        rm -rf "${imgroot}/boot"
-        cp -r "${instroot}/boot" "${imgroot}"
-        cp -rf "${DEF_CONFIG_DIR}/boot" "${imgroot}"
-    fi
-
-    # TODO: this might belong somewhere else
-    mkdir -p "${imgroot}/addons"
-    if [ -d "${ADDON_DIR}" ]; then
-        echo "Copying addons from ${ADDON_DIR}..."
-        cp -r ${ADDON_DIR}/* "${imgroot}/addons"
-    fi
-
-    # always make an addon out of DEF_CONFIG_DIR
-    echo "Creating default-config addon..."
-    if [ "${QUIET}" = "y" ]; then
-        mksquashfs "${DEF_CONFIG_DIR}" "${imgroot}/addons/default-config.sqfs" -noappend >/dev/null
-    else
-        mksquashfs "${DEF_CONFIG_DIR}" "${imgroot}/addons/default-config.sqfs" -noappend
-    fi
-fi
-
-# Squash is the next step.
-if [ "${command_name}" = "squash" -o "${command_name}" = "all" ]; then
-    echo "====> Generating SquashFS image"
-    imagename="${imgroot}/archlive.sqfs"
-    if [ -e "${imagename}" ]; then
-        if [ "${FORCE}" = "y" ]; then
-            echo -n "Removing old SquashFS image..."
-            rm "${imagename}"
-            echo "done."
-        else
-            echo "error: SquashFS image '${imagename}' already exists, aborting."
-            exit 1
-        fi
-    fi
-
-    echo "Creating squashfs image. This may take some time..."
-    start=$(date +%s)
-    if [ "${QUIET}" = "y" ]; then
-        mksquashfs "${instroot}" "${imagename}" -noappend >/dev/null
-    else
-        mksquashfs "${instroot}" "${imagename}" -noappend
-    fi
-    minutes=$(echo $start $(date +%s) | awk '{ printf "%0.2f",($2-$1)/60 }')
-    echo "Image creation done in $minutes minutes."
-fi
-
-# Finally, make the image.
-if [ "${command_name}" = "img" -o "${command_name}" = "all" ]; then
-    echo "====> Making bootable image"
-    [ "x${imgname}" = "x" ] && (echo "Bootable image name must be specified" && usage 1)
-    if [ -e "${imgname}" ]; then
-        if [ "${FORCE}" = "y" ]; then
-            echo "Removing existing bootable image..."
-            rm -rf "${imgname}"
-        else
-            echo "error: Image '${imgname}' already exists, aborting."
-            exit 1
-        fi
-    fi
-    if [ ! -e "${CPIOCONFIG}" ]; then
-        echo "error: mkinitcpio config '${CPIOCONFIG}' does not exist, aborting."
-        exit 1
-    fi
-
-    kernelver=$(_kversion)
-    basedir=${instroot}
-    [ "${instroot:0:1}" != "/" ] && basedir="$(pwd)/${instroot}"
-    echo "Generating initcpio for image..."
-    if [ "${QUIET}" = "y" ]; then
-        mkinitcpio -c "${CPIOCONFIG}" -b "${basedir}" -k "${kernelver}" -g "${imgroot}/boot/archlive.img" >/dev/null
-        ret=$?
-    else
-        mkinitcpio -c "${CPIOCONFIG}" -b "${basedir}" -k "${kernelver}" -g "${imgroot}/boot/archlive.img"
-        ret=$?
-    fi
-    if [ $ret -ne 0 ]; then
-        echo "error: initcpio image creation failed..."
-        exit 1
-    fi
-
-    cp ${instroot}/usr/lib/grub/i386-pc/* "${imgroot}/boot/grub"
-
-    if [ "x$IMG_TYPE" == "xdisk" ]; then
-        echo "Creating DISK image..."
-        mkusbimg "${imgroot}" "${imgname}"
-    else
-        echo "Creating ISO image..."
-        q=""
-        [ "${QUIET}" = "y" ] && qflag="-q"
-        mkisofs ${qflag} -r -l -b "boot/grub/stage2_eltorito" -uid 0 -gid 0 \
-            -no-emul-boot -boot-load-size 4 -boot-info-table \
-            -publisher "Arch Linux <archlinux.org>" \
-            -input-charset=UTF-8 -p "prepared by $NAME" \
-            -A "Arch Linux Live/Rescue CD" \
-            -o "${imgname}" "${imgroot}"
-    fi
-fi
-
-# vim:ts=4:sw=4:et:

mkusbimg

@@ -1,78 +0,0 @@
-#!/bin/bash
-#
-#    mkusbimg - creates a bootable disk image
-#    Copyright (C) 2008  Simo Leone <simo@archlinux.org>
-#
-#    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 3 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 <http://www.gnu.org/licenses/>.
-
-# usage(exitvalue)
-# outputs a usage message and exits with value
-APPNAME=$(basename "${0}")
-usage()
-{
-    echo "usage: ${APPNAME} <imageroot> <imagefile>"
-    exit $1
-}
-
-##################################################
-
-if [ $# -ne 2 ]; then
-    usage 1
-fi
-
-DISKIMG="${2}"
-IMGROOT="${1}"
-TMPDIR=$(mktemp -d)
-FSIMG=$(mktemp)
-
-# ext2 overhead's upper bound is 6%
-# empirically tested up to 1GB
-rootsize=$(du -bs ${IMGROOT}|cut -f1)
-IMGSZ=$(( (${rootsize}*106)/100/512 + 1)) # image size in sectors
-
-# create the filesystem image file
-dd if=/dev/zero of="$FSIMG" bs=512 count="$IMGSZ"
-
-# create a filesystem on the image
-mke2fs -m 0 -F "$FSIMG"
-
-# mount the filesystem and copy data
-mount -o loop "$FSIMG" "$TMPDIR"
-cp -a "$IMGROOT"/* "$TMPDIR"
-
-# unmount filesystem
-umount "$TMPDIR"
-
-# add sectors 0-62, then glue together
-dd if=/dev/zero of="$DISKIMG" bs=512 count=63
-cat "$FSIMG" >> "$DISKIMG"
-
-# create a partition table
-# if this looks like voodoo, it's because it is
-sfdisk -uS -f "$DISKIMG" << EOF
-63,$IMGSZ,83,*
-0,0,00
-0,0,00
-0,0,00
-EOF
-
-# install grub on the image
-grub --no-floppy --batch << EOF
-device (hd0) $DISKIMG
-root (hd0,0)
-setup (hd0)
-EOF
-
-# all done :)
-rm -fr "$TMPDIR" "$FSIMG"

packages.list

@@ -1,119 +0,0 @@
-bash
-bin86
-bzip2
-coreutils
-cpio
-cracklib
-cryptsetup
-db
-dcron
-dhcpcd
-dialog
-diffutils
-dnsutils
-dosfstools
-e2fsprogs
-ed
-fakeroot
-elinks
-file
-filesystem
-findutils
-fuse
-gawk
-gcc
-gettext
-glibc
-grep
-grub-gfx
-gzip
-hdparm
-initscripts
-iptables
-iputils
-ipw3945
-jfsutils
-kbd
-kernel-headers
-kernel26
-less
-lftp
-libusb
-licenses
-lilo
-lshwd
-lsof
-lvm2
-lzo2
-madwifi
-madwifi-utils
-mailx
-man
-man-pages
-mdadm
-memtest86+
-mkinitcpio
-mktemp
-module-init-tools
-nano
-ncurses
-ndiswrapper
-ndiswrapper-utils
-net-tools
-netcat
-netkit-telnet
-nfs-utils
-ntfs-3g
-ntfsprogs
-nmap
-openssh
-openssl
-openvpn
-pacman
-pam
-parted
-pciutils
-pcmciautils
-pcre
-perl
-popt
-portmap
-ppp
-pptpclient
-procinfo
-procps
-psmisc
-python
-readline
-reiserfsprogs
-rp-pppoe
-rt2500
-screen
-sed
-shadow
-squashfs-tools
-sudo
-sysfsutils
-syslog-ng
-sysvinit
-tar
-tcp_wrappers
-tcpdump
-udev
-unionfs-utils
-unrar
-unzip
-usbutils
-util-linux-ng
-vi
-vim
-wget
-which
-wireless_tools
-wlan-ng26
-wlan-ng26-utils
-wpa_supplicant
-xfsdump
-xfsprogs
-zd1211-firmware
-zlib

testiso

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-if [ $# -ne 1 ]; then
-    echo "usage: testiso <iso name>"
-    exit 1
-fi
-qemu -boot d -kernel-kqemu -m 256 -cdrom "${1}"