diff options
| -rw-r--r-- | build-x86-images.sh.in | 9 | ||||
| -rw-r--r-- | installer.sh.in | 46 | ||||
| -rw-r--r-- | mklive.sh.in | 3 |
3 files changed, 19 insertions, 39 deletions
diff --git a/build-x86-images.sh.in b/build-x86-images.sh.in index 0fbf593..5ea5b04 100644 --- a/build-x86-images.sh.in +++ b/build-x86-images.sh.in @@ -3,11 +3,12 @@ ARCH= IMAGE= -while getopts "a:b:h" opt; do +while getopts "a:b:hr:" opt; do case $opt in a) ARCH="$OPTARG";; b) IMAGE="$OPTARG";; - h) echo "${0#/*}: [-a arch] [-b base|e|xfce|mate|cinnamon|kde|lxde]" >&2; exit 1;; + h) echo "${0#/*}: [-a arch] [-b base|e|xfce|mate|cinnamon|kde|lxde|lxqt] [-r repo]" >&2; exit 1;; + r) REPO="-r $OPTARG $REPO";; esac done shift $((OPTIND - 1)) @@ -43,7 +44,7 @@ readonly LXQT_PKGS="$X_PKGS lxdm lxqt gvfs-afc gvfs-mtp gvfs-smb udisks2 qupzill if [ -z "$IMAGE" -o "$IMAGE" = base ]; then if [ ! -e $BASE_IMG ]; then - ./mklive.sh -a $ARCH -o $BASE_IMG -p "$BASE_PKGS" $@ + ./mklive.sh -a $ARCH -o $BASE_IMG -p "$BASE_PKGS" ${REPO} $@ fi fi if [ -z "$IMAGE" -o "$IMAGE" = e ]; then @@ -71,7 +72,7 @@ if [ -z "$IMAGE" -o "$IMAGE" = lxde ]; then ./mklive.sh -a $ARCH -o $LXDE_IMG -p "$LXDE_PKGS" $@ fi fi -if [ "$IMAGE" = lxqt ]; then +if [ -z "$IMAGE" -o "$IMAGE" = lxqt ]; then if [ ! -e $LXQT_IMG ]; then ./mklive.sh -a $ARCH -o $LXQT_IMG -p "$LXQT_PKGS" $@ fi diff --git a/installer.sh.in b/installer.sh.in index ee1a243..731ea09 100644 --- a/installer.sh.in +++ b/installer.sh.in @@ -1,6 +1,6 @@ #!/bin/sh #- -# Copyright (c) 2012-2014 Juan Romero Pardines <xtraeme@gmail.com>. +# Copyright (c) 2012-2015 Juan Romero Pardines <xtraeme@voidlinux.eu>. # 2012 Dave Elusive <davehome@redthumb.info.tm>. # All rights reserved. # @@ -36,7 +36,6 @@ BOOTLOADER_DONE= PARTITIONS_DONE= NETWORK_DONE= FILESYSTEMS_DONE= -SYSTEMD_INIT= TARGETDIR=/mnt/target LOG=/dev/tty8 @@ -59,11 +58,6 @@ if [ -e /sys/firmware/efi/systab ]; then EFI_SYSTEM=1 fi -# Detect if systemd is installed -if [ "$(cat /proc/1/comm)" = "systemd" ]; then - SYSTEMD_INIT=1 -fi - # dialog colors BLACK="\Z0" RED="\Z1" @@ -190,7 +184,7 @@ show_partitions() { [ "$fstype" = "crypto_LUKS" ] && continue [ "$fstype" = "LVM2_member" ] && continue fssize=$(lsblk -nr /dev/cciss/$part|awk '{print $4}') - echo "$part" + echo "/dev/cciss/$part" echo "size:${fssize:-unknown};fstype:${fstype:-none}" done if [ -e /sbin/lvs ]; then @@ -248,7 +242,10 @@ menu_filesystems() { set -- "$fstype" "$fssize" "$mntpoint" "$reformat" if [ -n "$1" -a -n "$2" -a -n "$3" -a -n "$4" ]; then local bdev=$(basename $dev) - if grep -Eq "^MOUNTPOINT \/dev\/${bdev}.*" $CONF_FILE; then + local ddev=$(basename $(dirname $dev)) + if [ "$ddev" != "dev" ]; then + sed -i -e "/^MOUNTPOINT \/dev\/${ddev}\/${bdev}.*/d" $CONF_FILE + else sed -i -e "/^MOUNTPOINT \/dev\/${bdev}.*/d" $CONF_FILE fi echo "MOUNTPOINT $dev $1 $2 $3 $4" >>$CONF_FILE @@ -287,11 +284,7 @@ ${RESET}\n" 18 80 } menu_keymap() { - if [ -n "$SYSTEMD_INIT" ]; then - local _keymaps="$(localectl --no-pager list-keymaps)" - else - local _keymaps="$(find /usr/share/kbd/keymaps/ -type f -iname "*.map.gz" -printf "%f\n" | sed 's|.map.gz||g' | sort)" - fi + local _keymaps="$(find /usr/share/kbd/keymaps/ -type f -iname "*.map.gz" -printf "%f\n" | sed 's|.map.gz||g' | sort)" local _KEYMAPS= for f in ${_keymaps}; do @@ -351,11 +344,7 @@ set_locale() { } menu_timezone() { - if [ -n "$SYSTEMD_INIT" ]; then - local _tzones="$(timedatectl --no-pager list-timezones)" - else - local _tzones="$(cd /usr/share/zoneinfo; find Africa/ America/ Antarctica/ Arctic/ Asia/ Atlantic/ Australia/ Europe/ Indian/ Pacific/ -type f | sort)" - fi + local _tzones="$(cd /usr/share/zoneinfo; find Africa/ America/ Antarctica/ Arctic/ Asia/ Atlantic/ Australia/ Europe/ Indian/ Pacific/ posix/ -type f | sort)" local _TIMEZONES= for f in ${_tzones}; do @@ -376,11 +365,7 @@ menu_timezone() { set_timezone() { local TIMEZONE="$(get_option TIMEZONE)" - if [ -z "$SYSTEMD_INIT" ]; then - sed -i -e "s|#TIMEZONE=.*|TIMEZONE=$TIMEZONE|g" $TARGETDIR/etc/rc.conf - else - ln -sf /usr/share/zoneinfo/${TIMEZONE} $TARGETDIR/etc/localtime - fi + sed -i -e "s|#TIMEZONE=.*|TIMEZONE=$TIMEZONE|g" $TARGETDIR/etc/rc.conf } menu_hostname() { @@ -827,11 +812,7 @@ install_packages() { } enable_dhcpd() { - if [ -n "$SYSTEMD_INIT" ]; then - chroot $TARGETDIR systemctl enable dhcpcd.service >$LOG 2>&1 - else - ln -s /etc/sv/dhcpcd $TARGETDIR/etc/runit/runsvdir/default/dhcpcd - fi + ln -sf /etc/sv/dhcpcd $TARGETDIR/etc/runit/runsvdir/default/dhcpcd } menu_install() { @@ -875,6 +856,7 @@ ${BOLD}Do you want to continue?${RESET}" 20 80 || return # Remove live user. echo "Removing $USERNAME live user from targetdir ..." >$LOG chroot $TARGETDIR userdel -r $USERNAME >$LOG 2>&1 + sed -i -e "/$USERNAME ALL=.*/d" $TARGETDIR/etc/sudoers DIALOG --title "Check $LOG for details" \ --infobox "Rebuilding initramfs for target ..." 4 60 echo "Rebuilding initramfs for target ..." >$LOG @@ -922,11 +904,7 @@ ${BOLD}Do you want to continue?${RESET}" 20 80 || return elif [ "$_type" = "dhcp" ]; then if [ -f /etc/wpa_supplicant/wpa_supplicant-${_dev}.conf ]; then cp /etc/wpa_supplicant/wpa_supplicant-${_dev}.conf $TARGETDIR/etc/wpa_supplicant - if [ -n "$SYSTEMD_INIT" ]; then - chroot $TARGETDIR systemctl enable dhcpcd@${_dev}.service >$LOG 2>&1 - else - ln -s /etc/sv/dhcpcd-${_dev} $TARGETDIR/etc/runit/runsvdir/default/dhcpcd-${_dev} - fi + ln -sf /etc/sv/dhcpcd-${_dev} $TARGETDIR/etc/runit/runsvdir/default/dhcpcd-${_dev} else enable_dhcpd fi diff --git a/mklive.sh.in b/mklive.sh.in index 797df5b..871c65f 100644 --- a/mklive.sh.in +++ b/mklive.sh.in @@ -280,7 +280,6 @@ generate_iso_image() { -output "$CURDIR/$OUTPUT_FILE" "$IMAGEDIR" || die "Failed to generate ISO image" } -XBPS_REPOSITORY="--repository=http://repo.voidlinux.eu/current --repository=http://muslrepo.voidlinux.eu/current" # # main() # @@ -305,6 +304,8 @@ while getopts "a:b:r:c:C:T:Kk:l:i:s:S:o:p:h" opt; do done shift $((OPTIND - 1)) +XBPS_REPOSITORY="$XBPS_REPOSITORY --repository=http://repo.voidlinux.eu/current --repository=http://muslrepo.voidlinux.eu/current" + ARCH=$(uname -m) # Set defaults |