From 74553a3a794a02dfd2df037f9f9a0edc248b14b2 Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Thu, 3 Feb 2011 22:20:37 +0100 Subject: [PATCH] replace ${DESTDIR} with $DESTDIR in setup --- usr/share/archboot/installer/setup | 434 ++++++++++++++--------------- 1 file changed, 217 insertions(+), 217 deletions(-) diff --git a/usr/share/archboot/installer/setup b/usr/share/archboot/installer/setup index 278f953c1..3262c65ba 100755 --- a/usr/share/archboot/installer/setup +++ b/usr/share/archboot/installer/setup @@ -17,7 +17,7 @@ KERNELPKG="kernel26" [[ "$(cat /proc/cmdline | grep -w BOOT_IMAGE=.*lts)" ]] && KERNELPKG="kernel26-lts" # abstract the common pacman args -PACMAN="pacman --root ${DESTDIR} --config /tmp/pacman.conf --noconfirm --noprogressbar" +PACMAN="pacman --root $DESTDIR --config /tmp/pacman.conf --noconfirm --noprogressbar" # downloader DLPROG="wget" # sources @@ -68,12 +68,12 @@ DIALOG() { # chroot_mount() { - [[ -e "${DESTDIR}/sys" ]] || mkdir "${DESTDIR}/sys" - [[ -e "${DESTDIR}/proc" ]] || mkdir "${DESTDIR}/proc" - [[ -e "${DESTDIR}/dev" ]] || mkdir "${DESTDIR}/dev" - mount -t sysfs sysfs "${DESTDIR}/sys" - mount -t proc proc "${DESTDIR}/proc" - mount -o bind /dev "${DESTDIR}/dev" + [[ -e "$DESTDIR/sys" ]] || mkdir "$DESTDIR/sys" + [[ -e "$DESTDIR/proc" ]] || mkdir "$DESTDIR/proc" + [[ -e "$DESTDIR/dev" ]] || mkdir "$DESTDIR/dev" + mount -t sysfs sysfs "$DESTDIR/sys" + mount -t proc proc "$DESTDIR/proc" + mount -o bind /dev "$DESTDIR/dev" } # chroot_umount() @@ -81,9 +81,9 @@ chroot_mount() # chroot_umount() { - umount ${DESTDIR}/proc - umount ${DESTDIR}/sys - umount ${DESTDIR}/dev + umount $DESTDIR/proc + umount $DESTDIR/sys + umount $DESTDIR/dev } # getuuid() @@ -261,16 +261,16 @@ manual_media() { } # destdir_mounts() -# check if PART_ROOT is set and if something is mounted on ${DESTDIR} +# check if PART_ROOT is set and if something is mounted on $DESTDIR destdir_mounts(){ # Don't ask for filesystem and create new filesystems ASK_MOUNTPOINTS="" PART_ROOT="" - # check if something is mounted on ${DESTDIR} - PART_ROOT="$(mount | grep "${DESTDIR} " | cut -d' ' -f 1)" - # Run mountpoints, if nothing is mounted on ${DESTDIR} + # check if something is mounted on $DESTDIR + PART_ROOT="$(mount | grep "$DESTDIR " | cut -d' ' -f 1)" + # Run mountpoints, if nothing is mounted on $DESTDIR if [[ "$PART_ROOT" = "" ]]; then - DIALOG --msgbox "Setup couldn't detect mounted partition(s) in ${DESTDIR}, please set mountpoints first." 0 0 + DIALOG --msgbox "Setup couldn't detect mounted partition(s) in $DESTDIR, please set mountpoints first." 0 0 mountpoints || return 1 fi } @@ -565,13 +565,13 @@ findbootloaderpartitions() { freeze_xfs() { sync if [[ -x /usr/sbin/xfs_freeze ]]; then - if [[ "$(cat /proc/mounts | grep "${DESTDIR}/boot " | grep " xfs ")" ]]; then - /usr/sbin/xfs_freeze -f ${DESTDIR}/boot >/dev/null 2>&1 - /usr/sbin/xfs_freeze -u ${DESTDIR}/boot >/dev/null 2>&1 + if [[ "$(cat /proc/mounts | grep "$DESTDIR/boot " | grep " xfs ")" ]]; then + /usr/sbin/xfs_freeze -f $DESTDIR/boot >/dev/null 2>&1 + /usr/sbin/xfs_freeze -u $DESTDIR/boot >/dev/null 2>&1 fi - if [[ "$(cat /proc/mounts | grep "${DESTDIR} " | grep " xfs ")" ]]; then - /usr/sbin/xfs_freeze -f ${DESTDIR} >/dev/null 2>&1 - /usr/sbin/xfs_freeze -u ${DESTDIR} >/dev/null 2>&1 + if [[ "$(cat /proc/mounts | grep "$DESTDIR " | grep " xfs ")" ]]; then + /usr/sbin/xfs_freeze -f $DESTDIR >/dev/null 2>&1 + /usr/sbin/xfs_freeze -u $DESTDIR >/dev/null 2>&1 fi fi } @@ -579,7 +579,7 @@ freeze_xfs() { get_grub_map() { rm /tmp/dev.map DIALOG --infobox "Generating GRUB device map...\nThis could take a while.\n\n Please be patient." 0 0 - ${DESTDIR}/sbin/grub --no-floppy --device-map /tmp/dev.map >/tmp/grub.log 2>&1 </tmp/grub.log 2>&1 <>/tmp/grub2.log + $DESTDIR/sbin/grub-mkdevicemap --no-floppy --device-map=/tmp/device.map >>/tmp/grub2.log } mapdev() { @@ -725,7 +725,7 @@ printk() } getdest() { - [[ "${DESTDIR}" ]] && return 0 + [[ "$DESTDIR" ]] && return 0 DIALOG --inputbox "Enter the destination directory where your target system is mounted" 8 65 "/tmp/install" 2>$ANSWER || return 1 DESTDIR=$(cat $ANSWER) } @@ -830,8 +830,8 @@ _umountall() { DIALOG --infobox "Disabling swapspace, unmounting already mounted disk devices..." 0 0 swapoff -a >/dev/null 2>&1 - umount $(mount | grep -v "${DESTDIR} " | grep "${DESTDIR}" | sed 's|\ .*||g') >/dev/null 2>&1 - umount $(mount | grep "${DESTDIR} " | sed 's|\ .*||g') >/dev/null 2>&1 + umount $(mount | grep -v "$DESTDIR " | grep "$DESTDIR" | sed 's|\ .*||g') >/dev/null 2>&1 + umount $(mount | grep "$DESTDIR " | sed 's|\ .*||g') >/dev/null 2>&1 } # Disable all software raid devices @@ -1703,8 +1703,8 @@ autoprepare() { fi # validate DEST - if [[ ! -d "${DESTDIR}" ]]; then - DIALOG --msgbox "Destination directory '${DESTDIR}' is not valid" 0 0 + if [[ ! -d "$DESTDIR" ]]; then + DIALOG --msgbox "Destination directory '$DESTDIR' is not valid" 0 0 return 1 fi @@ -1769,7 +1769,7 @@ autoprepare() { dosubvolume="no" if echo $mountpoint | tr -d ' ' | grep '^/$' 2>&1 >/dev/null; then DIALOG --infobox "Creating $fstype on ${DEVICE}${part}" 0 0 - _mkfs yes ${DEVICE}${part} "$fstype" "${DESTDIR}" "$mountpoint" "$labelname" "$fsoptions" "$btrfsdevices" "$btrfssubvolume" "$btrfslevel" "$dosubvolume" "$btrfssd" "$btrfscompress" || return 1 + _mkfs yes ${DEVICE}${part} "$fstype" "$DESTDIR" "$mountpoint" "$labelname" "$fsoptions" "$btrfsdevices" "$btrfssubvolume" "$btrfslevel" "$dosubvolume" "$btrfssd" "$btrfscompress" || return 1 fi part=$(($part + 1)) done @@ -1790,7 +1790,7 @@ autoprepare() { dosubvolume="no" if [[ "$(echo $mountpoint | tr -d ' ' | grep '^/$' | wc -l)" -eq 0 ]]; then DIALOG --infobox "Creating $fstype on ${DEVICE}${part}" 0 0 - _mkfs yes ${DEVICE}${part} "$fstype" "${DESTDIR}" "$mountpoint" "$labelname" "$fsoptions" "$btrfsdevices" "$btrfssubvolume" "$btrfslevel" "$dosubvolume" "$btrfssd" "$btrfscompress" || return 1 + _mkfs yes ${DEVICE}${part} "$fstype" "$DESTDIR" "$mountpoint" "$labelname" "$fsoptions" "$btrfsdevices" "$btrfssubvolume" "$btrfslevel" "$dosubvolume" "$btrfssd" "$btrfscompress" || return 1 fi part=$(($part + 1)) done @@ -2384,16 +2384,16 @@ mountpoints() { if [[ "$FSTYPE" = "swap" ]]; then DIALOG --infobox "Creating and activating swapspace on $PART" 0 0 else - DIALOG --infobox "Creating $FSTYPE on $PART, mounting to ${DESTDIR}${MP}" 0 0 + DIALOG --infobox "Creating $FSTYPE on $PART, mounting to $DESTDIR${MP}" 0 0 fi - _mkfs yes $PART $FSTYPE ${DESTDIR} $MP $LABEL_NAME $FS_OPTIONS $BTRFS_DEVICES $BTRFS_LEVEL $BTRFS_SUBVOLUME $DOSUBVOLUME $BTRFS_COMPRESS $BTRFS_SSD || return 1 + _mkfs yes $PART $FSTYPE $DESTDIR $MP $LABEL_NAME $FS_OPTIONS $BTRFS_DEVICES $BTRFS_LEVEL $BTRFS_SUBVOLUME $DOSUBVOLUME $BTRFS_COMPRESS $BTRFS_SSD || return 1 else if [[ "$FSTYPE" = "swap" ]]; then DIALOG --infobox "Activating swapspace on $PART" 0 0 else - DIALOG --infobox "Mounting $FSTYPE on $PART to ${DESTDIR}${MP}" 0 0 + DIALOG --infobox "Mounting $FSTYPE on $PART to $DESTDIR${MP}" 0 0 fi - _mkfs no $PART $FSTYPE ${DESTDIR} $MP $LABEL_NAME $FS_OPTIONS $BTRFS_DEVICES $BTRFS_LEVEL $BTRFS_SUBVOLUME $DOSUBVOLUME $BTRFS_COMPRESS $BTRFS_SSD || return 1 + _mkfs no $PART $FSTYPE $DESTDIR $MP $LABEL_NAME $FS_OPTIONS $BTRFS_DEVICES $BTRFS_LEVEL $BTRFS_SUBVOLUME $DOSUBVOLUME $BTRFS_COMPRESS $BTRFS_SSD || return 1 fi sleep 1 done @@ -2612,7 +2612,7 @@ pacman_conf() { cat << EOF > /tmp/pacman.conf [options] Architecture = auto -CacheDir = ${DESTDIR}/var/cache/pacman/pkg +CacheDir = $DESTDIR/var/cache/pacman/pkg CacheDir = /src/core-$(uname -m)/pkg CacheDir = /src/core-any/pkg @@ -2629,8 +2629,8 @@ EOF # returns: 1 on error prepare_pacman() { # Set up the necessary directories for pacman use - [[ ! -d "${DESTDIR}/var/cache/pacman/pkg" ]] && mkdir -m 755 -p "${DESTDIR}/var/cache/pacman/pkg" - [[ ! -d "${DESTDIR}/var/lib/pacman" ]] && mkdir -m 755 -p "${DESTDIR}/var/lib/pacman" + [[ ! -d "$DESTDIR/var/cache/pacman/pkg" ]] && mkdir -m 755 -p "$DESTDIR/var/cache/pacman/pkg" + [[ ! -d "$DESTDIR/var/lib/pacman" ]] && mkdir -m 755 -p "$DESTDIR/var/lib/pacman" DIALOG --infobox "Refreshing package database..." 6 45 $PACMAN -Sy >$LOG 2>&1 || return 1 @@ -2882,12 +2882,12 @@ auto_fstab(){ # Modify fstab if [[ "$S_MKFS" = "1" || "$S_MKFSAUTO" = "1" ]]; then if [[ -f /tmp/.device-names ]]; then - sort /tmp/.device-names >>${DESTDIR}/etc/fstab + sort /tmp/.device-names >>$DESTDIR/etc/fstab fi if [[ -f /tmp/.fstab ]]; then # clean fstab first from /dev entries - sed -i -e '/^\/dev/d' ${DESTDIR}/etc/fstab - sort /tmp/.fstab >>${DESTDIR}/etc/fstab + sed -i -e '/^\/dev/d' $DESTDIR/etc/fstab + sort /tmp/.fstab >>$DESTDIR/etc/fstab fi fi } @@ -2896,21 +2896,21 @@ auto_fstab(){ # enable glibc locales from rc.conf and build initial locale DB auto_locale() { - for i in $(grep "^LOCALE" ${DESTDIR}/etc/rc.conf | sed -e 's/.*="//g' -e's/\..*//g'); do - sed -i -e "s/^#$i/$i/g" ${DESTDIR}/etc/locale.gen + for i in $(grep "^LOCALE" $DESTDIR/etc/rc.conf | sed -e 's/.*="//g' -e's/\..*//g'); do + sed -i -e "s/^#$i/$i/g" $DESTDIR/etc/locale.gen done DIALOG --infobox "Generating glibc base locales..." 4 40 - chroot ${DESTDIR} locale-gen >/dev/null 2>&1 + chroot $DESTDIR locale-gen >/dev/null 2>&1 } # auto_mdadm() # add mdadm setup to existing /etc/mdadm.conf auto_mdadm() { - if [[ -e ${DESTDIR}/etc/mdadm.conf ]];then + if [[ -e $DESTDIR/etc/mdadm.conf ]];then if [[ "$(cat /proc/mdstat | grep ^md)" ]]; then - DIALOG --infobox "Adding raid setup to ${DESTDIR}/etc/mdadm.conf ..." 4 40 - mdadm -Ds >> ${DESTDIR}/etc/mdadm.conf + DIALOG --infobox "Adding raid setup to $DESTDIR/etc/mdadm.conf ..." 4 40 + mdadm -Ds >> $DESTDIR/etc/mdadm.conf fi fi } @@ -2929,23 +2929,23 @@ auto_network() DIALOG --yesno "Do you want to use the previous network settings in rc.conf and resolv.conf?\nIf you used Proxy settings, they will be written to /etc/profile.d/proxy.sh" 0 0 || return 1 if [[ "$S_DHCP" != "1" ]]; then - sed -i -e "s#^eth.*#$INTERFACE=\"$INTERFACE $IPADDR netmask $SUBNET broadcast $BROADCAST\"#g" ${DESTDIR}/etc/rc.conf + sed -i -e "s#^eth.*#$INTERFACE=\"$INTERFACE $IPADDR netmask $SUBNET broadcast $BROADCAST\"#g" $DESTDIR/etc/rc.conf if [[ "$GW" != "" ]]; then - sed -i -e "s#gw 192.168.0.1#gw $GW#g" ${DESTDIR}/etc/rc.conf - sed -i -e "s#!gateway#gateway#g" ${DESTDIR}/etc/rc.conf + sed -i -e "s#gw 192.168.0.1#gw $GW#g" $DESTDIR/etc/rc.conf + sed -i -e "s#!gateway#gateway#g" $DESTDIR/etc/rc.conf fi - echo "nameserver $DNS" >> ${DESTDIR}/etc/resolv.conf + echo "nameserver $DNS" >> $DESTDIR/etc/resolv.conf else - sed -i -e "s#^eth.*#$INTERFACE=\"dhcp\"#g" ${DESTDIR}/etc/rc.conf + sed -i -e "s#^eth.*#$INTERFACE=\"dhcp\"#g" $DESTDIR/etc/rc.conf fi - sed -i -e "s#eth0)#$INTERFACE)#g" ${DESTDIR}/etc/rc.conf + sed -i -e "s#eth0)#$INTERFACE)#g" $DESTDIR/etc/rc.conf if [[ "$PROXY_HTTP" != "" ]]; then - echo "export http_proxy=$PROXY_HTTP" >> ${DESTDIR}/etc/profile.d/proxy.sh; - chmod a+x ${DESTDIR}/etc/profile.d/proxy.sh + echo "export http_proxy=$PROXY_HTTP" >> $DESTDIR/etc/profile.d/proxy.sh; + chmod a+x $DESTDIR/etc/profile.d/proxy.sh fi if [[ "$PROXY_FTP" != "" ]]; then - echo "export ftp_proxy=$PROXY_FTP" >> ${DESTDIR}/etc/profile.d/proxy.sh; - chmod a+x ${DESTDIR}/etc/profile.d/proxy.sh + echo "export ftp_proxy=$PROXY_FTP" >> $DESTDIR/etc/profile.d/proxy.sh; + chmod a+x $DESTDIR/etc/profile.d/proxy.sh fi } @@ -3056,12 +3056,12 @@ ROOTFS="$(blkid -c /dev/null $PART_ROOT -o value -s TYPE)" getrootflags() { # remove gcpid for nilfs2 -ROOTFLAGS="$(findmnt -m -n -o options -T ${DESTDIR} | sed -e 's/,gcpid=.*[0-9]//g')" +ROOTFLAGS="$(findmnt -m -n -o options -T $DESTDIR | sed -e 's/,gcpid=.*[0-9]//g')" } getraidarrays() { RAIDARRAYS="" - if ! [[ "$(grep ^ARRAY ${DESTDIR}/etc/mdadm.conf)" ]]; then + if ! [[ "$(grep ^ARRAY $DESTDIR/etc/mdadm.conf)" ]]; then RAIDARRAYS="$(echo -n $(cat /proc/mdstat 2>/dev/null | grep ^md | sed -e 's#\[[0-9]\]##g' -e 's# :.* raid[0-9]##g' -e 's#md#md=#g' -e 's# #,/dev/#g' -e 's#_##g'))" fi } @@ -3115,7 +3115,7 @@ common_bootloader_checks() { # look for a separately-mounted /boot partition check_bootpart() { subdir="" - bootdev=$(mount | grep ${DESTDIR}/boot | cut -d' ' -f 1) + bootdev=$(mount | grep $DESTDIR/boot | cut -d' ' -f 1) if [[ "$bootdev" = "" ]]; then subdir=/boot bootdev=$PART_ROOT @@ -3142,7 +3142,7 @@ abort_nilfs_bootpart() { # install syslinux and run preparation prepare_syslinux () { - if ! [[ -e "${DESTDIR}/sbin/extlinux" || -e "${DESTDIR}/usr/bin/mcopy" ]]; then + if ! [[ -e "$DESTDIR/sbin/extlinux" || -e "$DESTDIR/usr/bin/mcopy" ]]; then DIALOG --msgbox "Couldn't find bootloader binary or helper program, installing syslinux now ..." 0 0 PACKAGES="$SYSLINUX_PACKAGES" run_pacman @@ -3165,8 +3165,8 @@ common_syslinux () { ROOTDEV=$(cat $ANSWER) # generate config file TEMPDIR=/tmp - MBR=${DESTDIR}/usr/lib/syslinux/mbr.bin - GPTMBR=${DESTDIR}/usr/lib/syslinux/gptmbr.bin + MBR=$DESTDIR/usr/lib/syslinux/mbr.bin + GPTMBR=$DESTDIR/usr/lib/syslinux/gptmbr.bin # check if GPT/GUID is used GUID_DETECTED= [[ "$(parted -s $ROOTDEV print | grep "Partition Table: gpt")" ]] && GUID_DETECTED=1 @@ -3231,9 +3231,9 @@ EOF $EDITOR ${TEMPDIR}/${SYSLINUX_CONF} # install syslinux DIALOG --infobox "Installing the $SYSLINUX bootloader..." 0 0 - ! [[ -d ${DESTDIR}/boot/${SYSLINUX_DIR} ]] && mkdir -p ${DESTDIR}/boot/${SYSLINUX_DIR} - cp ${TEMPDIR}/${SYSLINUX_CONF} ${DESTDIR}/boot/${SYSLINUX_DIR}/${SYSLINUX_CONF} - cp ${DESTDIR}/usr/lib/syslinux/*.c32 ${DESTDIR}/boot/${SYSLINUX_DIR} + ! [[ -d $DESTDIR/boot/${SYSLINUX_DIR} ]] && mkdir -p $DESTDIR/boot/${SYSLINUX_DIR} + cp ${TEMPDIR}/${SYSLINUX_CONF} $DESTDIR/boot/${SYSLINUX_DIR}/${SYSLINUX_CONF} + cp $DESTDIR/usr/lib/syslinux/*.c32 $DESTDIR/boot/${SYSLINUX_DIR} if [[ "$GUID_DETECTED" = "" ]]; then cat ${MBR} > ${ROOTDEV} else @@ -3248,7 +3248,7 @@ finish_syslinux () { DIALOG --msgbox "Error installing $SYSLINUX. (see $LOG for output)" 0 0 return 1 fi - [[ -f "/src/boot/syslinux/splash.png" ]] && cp /src/boot/syslinux/splash.png ${DESTDIR}/boot/$SYSLINUX_DIR + [[ -f "/src/boot/syslinux/splash.png" ]] && cp /src/boot/syslinux/splash.png $DESTDIR/boot/$SYSLINUX_DIR chroot_umount # make partition with /boot active! @@ -3310,7 +3310,7 @@ doextlinux () { fi common_syslinux chroot_mount - chroot ${DESTDIR} $SYSLINUX_PROGRAM $SYSLINUX_OPTS --install /boot/$SYSLINUX_DIR >$LOG 2>&1 + chroot $DESTDIR $SYSLINUX_PROGRAM $SYSLINUX_OPTS --install /boot/$SYSLINUX_DIR >$LOG 2>&1 finish_syslinux } @@ -3326,7 +3326,7 @@ dosyslinux() { SYSLINUX_PROGRAM=syslinux prepare_syslinux # look for a separately-mounted /boot partition - bootdev=$(mount | grep ${DESTDIR}/boot | cut -d' ' -f 1) + bootdev=$(mount | grep $DESTDIR/boot | cut -d' ' -f 1) if [[ "$bootdev" = "" ]]; then DIALOG --msgbox "Error:\nCouldn't find separate /boot partition." 0 0 return 1 @@ -3344,13 +3344,13 @@ dosyslinux() { fi common_syslinux || return 1 chroot_mount - chroot ${DESTDIR} $SYSLINUX_PROGRAM $bootdev >$LOG 2>&1 + chroot $DESTDIR $SYSLINUX_PROGRAM $bootdev >$LOG 2>&1 finish_syslinux } dolilo() { - if [[ ! -f ${DESTDIR}/etc/lilo.conf ]]; then - DIALOG --msgbox "Couldn't find ${DESTDIR}/etc/lilo.conf, installing lilo now ..." 0 0 + if [[ ! -f $DESTDIR/etc/lilo.conf ]]; then + DIALOG --msgbox "Couldn't find $DESTDIR/etc/lilo.conf, installing lilo now ..." 0 0 PACKAGES="lilo" run_pacman # reset PACKAGES after installing @@ -3368,17 +3368,17 @@ dolilo() { # Try to auto-configure LILO... if ! [[ "$PART_ROOT" = "" ]]; then if [[ "$NAME_SCHEME_PARAMETER" = "UUID" || "$NAME_SCHEME_PARAMETER" = "LABEL" ]]; then - sed -i "s|.*root=.*$|append=\"root=${_rootpart} rootflags=$ROOTFLAGS rootfstype=$ROOTFS $RAIDARRAYS $CRYPTSETUP\"|g" ${DESTDIR}/etc/lilo.conf + sed -i "s|.*root=.*$|append=\"root=${_rootpart} rootflags=$ROOTFLAGS rootfstype=$ROOTFS $RAIDARRAYS $CRYPTSETUP\"|g" $DESTDIR/etc/lilo.conf else - sed -i "s|.*root=.*$|append=\"root=${PART_ROOT} rootflags=$ROOTFLAGS rootfstype=$ROOTFS $RAIDARRAYS $CRYPTSETUP\"|g" ${DESTDIR}/etc/lilo.conf + sed -i "s|.*root=.*$|append=\"root=${PART_ROOT} rootflags=$ROOTFLAGS rootfstype=$ROOTFS $RAIDARRAYS $CRYPTSETUP\"|g" $DESTDIR/etc/lilo.conf fi - sed -i "s|image=/boot/vmlinuz26|image=/boot/$VMLINUZ|g" ${DESTDIR}/etc/lilo.conf - sed -i "s|initrd=.*kernel26.*fallback.img$|initrd=/boot/$KERNELPKG-fallback.img|g" ${DESTDIR}/etc/lilo.conf - sed -i "s|initrd=.*kernel26.img$|initrd=/boot/$KERNELPKG.img|g" ${DESTDIR}/etc/lilo.conf - sed -i "s|initrd=.*kernel26-lts.img$|initrd=/boot/$KERNELPKG.img|g" ${DESTDIR}/etc/lilo.conf + sed -i "s|image=/boot/vmlinuz26|image=/boot/$VMLINUZ|g" $DESTDIR/etc/lilo.conf + sed -i "s|initrd=.*kernel26.*fallback.img$|initrd=/boot/$KERNELPKG-fallback.img|g" $DESTDIR/etc/lilo.conf + sed -i "s|initrd=.*kernel26.img$|initrd=/boot/$KERNELPKG.img|g" $DESTDIR/etc/lilo.conf + sed -i "s|initrd=.*kernel26-lts.img$|initrd=/boot/$KERNELPKG.img|g" $DESTDIR/etc/lilo.conf fi - sed -i -e '/DEVICE DETAILS/d' ${DESTDIR}/etc/lilo.conf - sort /tmp/.device-names >> ${DESTDIR}/etc/lilo.conf + sed -i -e '/DEVICE DETAILS/d' $DESTDIR/etc/lilo.conf + sort /tmp/.device-names >> $DESTDIR/etc/lilo.conf DEVS="$(findbootloaderdisks _)" DEVS="$DEVS $(findbootloaderpartitions _)" if [[ "$DEVS" = "" ]]; then @@ -3387,19 +3387,19 @@ dolilo() { fi DIALOG --menu "Select the boot device where the LILO bootloader will be installed (usually the MBR)" 14 55 7 $DEVS 2>$ANSWER || return 1 ROOTDEV=$(cat $ANSWER) - sed -i "s|boot=.*$|boot=$ROOTDEV|g" ${DESTDIR}/etc/lilo.conf + sed -i "s|boot=.*$|boot=$ROOTDEV|g" $DESTDIR/etc/lilo.conf # HACK: if virtio device is used if [[ "$(echo $ROOTDEV | grep /dev/vd)" ]]; then - sed -i "s|.*disk=.*$|disk=$ROOTDEV bios=0x80 max-partitions=7|g" ${DESTDIR}/etc/lilo.conf + sed -i "s|.*disk=.*$|disk=$ROOTDEV bios=0x80 max-partitions=7|g" $DESTDIR/etc/lilo.conf else - sed -i "s|^disk=.*$|# disk=$ROOTDEV bios=0x80|g" ${DESTDIR}/etc/lilo.conf + sed -i "s|^disk=.*$|# disk=$ROOTDEV bios=0x80|g" $DESTDIR/etc/lilo.conf fi DIALOG --msgbox "Before installing LILO, you must review the configuration file. You will now be put into the editor. After you save your changes and exit the editor, LILO will be installed." 0 0 geteditor || return 1 - $EDITOR ${DESTDIR}/etc/lilo.conf + $EDITOR $DESTDIR/etc/lilo.conf DIALOG --infobox "Installing the LILO bootloader..." 0 0 chroot_mount - chroot ${DESTDIR} /sbin/lilo >$LOG 2>&1 + chroot $DESTDIR /sbin/lilo >$LOG 2>&1 if [[ $? -gt 0 ]]; then chroot_umount DIALOG --msgbox "Error installing LILO. (see $LOG for output)" 0 0 @@ -3410,12 +3410,12 @@ dolilo() { } dogrub() { - if [[ -f ${DESTDIR}/boot/grub2/grub.cfg ]]; then - DIALOG --msgbox "Found ${DESTDIR}/boot/grub2/grub.cfg, deinstalling grub2 now ..." 0 0 + if [[ -f $DESTDIR/boot/grub2/grub.cfg ]]; then + DIALOG --msgbox "Found $DESTDIR/boot/grub2/grub.cfg, deinstalling grub2 now ..." 0 0 $PACMAN -R grub2 > $LOG fi - if [[ ! -f ${DESTDIR}/boot/grub/menu.lst ]]; then - DIALOG --msgbox "Couldn't find ${DESTDIR}/boot/grub/menu.lst, installing grub now ..." 0 0 + if [[ ! -f $DESTDIR/boot/grub/menu.lst ]]; then + DIALOG --msgbox "Couldn't find $DESTDIR/boot/grub/menu.lst, installing grub now ..." 0 0 PACKAGES="grub" run_pacman # reset PACKAGES after installing @@ -3496,9 +3496,9 @@ dogrub() { return 1 fi if [[ "$_grubdev" != "" ]]; then - cp ${DESTDIR}/boot/grub/menu.lst /tmp/.menu.lst + cp $DESTDIR/boot/grub/menu.lst /tmp/.menu.lst # remove the default entries by truncating the file at our little tag (#-*) - head -n $(cat /tmp/.menu.lst | grep -n '#-\*' | cut -d: -f 1) /tmp/.menu.lst >${DESTDIR}/boot/grub/menu.lst + head -n $(cat /tmp/.menu.lst | grep -n '#-\*' | cut -d: -f 1) /tmp/.menu.lst >$DESTDIR/boot/grub/menu.lst rm -f /tmp/.menu.lst # keep the file from being completely bogus if [[ "$_grubdev" = "DEVICE NOT FOUND" ]]; then @@ -3507,46 +3507,46 @@ dogrub() { fi NUMBER=0 # create default grub entries - sort /tmp/.device-names >>${DESTDIR}/boot/grub/menu.lst + sort /tmp/.device-names >>$DESTDIR/boot/grub/menu.lst for grubdev in $_grubdev; do - echo "" >>${DESTDIR}/boot/grub/menu.lst - echo "# ($NUMBER) Arch Linux" >>${DESTDIR}/boot/grub/menu.lst - echo "title Arch Linux" >>${DESTDIR}/boot/grub/menu.lst - echo "root $grubdev" >>${DESTDIR}/boot/grub/menu.lst + echo "" >>$DESTDIR/boot/grub/menu.lst + echo "# ($NUMBER) Arch Linux" >>$DESTDIR/boot/grub/menu.lst + echo "title Arch Linux" >>$DESTDIR/boot/grub/menu.lst + echo "root $grubdev" >>$DESTDIR/boot/grub/menu.lst if [[ "$NAME_SCHEME_PARAMETER" = "UUID" || "$NAME_SCHEME_PARAMETER" = "LABEL" ]]; then - echo "kernel $subdir/$VMLINUZ root=${_rootpart} rootflags=$ROOTFLAGS rootfstype=$ROOTFS $RAIDARRAYS $CRYPTSETUP ro" | sed -e 's# # #g' | sed -e 's# # #g' >>${DESTDIR}/boot/grub/menu.lst + echo "kernel $subdir/$VMLINUZ root=${_rootpart} rootflags=$ROOTFLAGS rootfstype=$ROOTFS $RAIDARRAYS $CRYPTSETUP ro" | sed -e 's# # #g' | sed -e 's# # #g' >>$DESTDIR/boot/grub/menu.lst else - echo "kernel $subdir/$VMLINUZ root=$PART_ROOT rootflags=$ROOTFLAGS rootfstype=$ROOTFS $RAIDARRAYS $CRYPTSETUP ro" | sed -e 's# # #g' | sed -e 's# # #g' >>${DESTDIR}/boot/grub/menu.lst + echo "kernel $subdir/$VMLINUZ root=$PART_ROOT rootflags=$ROOTFLAGS rootfstype=$ROOTFS $RAIDARRAYS $CRYPTSETUP ro" | sed -e 's# # #g' | sed -e 's# # #g' >>$DESTDIR/boot/grub/menu.lst fi - echo "initrd $subdir/$KERNELPKG.img" >>${DESTDIR}/boot/grub/menu.lst - echo "" >>${DESTDIR}/boot/grub/menu.lst + echo "initrd $subdir/$KERNELPKG.img" >>$DESTDIR/boot/grub/menu.lst + echo "" >>$DESTDIR/boot/grub/menu.lst # adding fallback/full image NUMBER=$(($NUMBER+1)) - echo "# ($NUMBER) Arch Linux" >>${DESTDIR}/boot/grub/menu.lst - echo "title Arch Linux Fallback" >>${DESTDIR}/boot/grub/menu.lst - echo "root $grubdev" >>${DESTDIR}/boot/grub/menu.lst + echo "# ($NUMBER) Arch Linux" >>$DESTDIR/boot/grub/menu.lst + echo "title Arch Linux Fallback" >>$DESTDIR/boot/grub/menu.lst + echo "root $grubdev" >>$DESTDIR/boot/grub/menu.lst if [[ "$NAME_SCHEME_PARAMETER" = "UUID" || "$NAME_SCHEME_PARAMETER" = "LABEL" ]]; then - echo "kernel $subdir/$VMLINUZ root=${_rootpart} rootflags=$ROOTFLAGS rootfstype=$ROOTFS $RAIDARRAYS $CRYPTSETUP ro" | sed -e 's# # #g' | sed -e 's# # #g' >>${DESTDIR}/boot/grub/menu.lst + echo "kernel $subdir/$VMLINUZ root=${_rootpart} rootflags=$ROOTFLAGS rootfstype=$ROOTFS $RAIDARRAYS $CRYPTSETUP ro" | sed -e 's# # #g' | sed -e 's# # #g' >>$DESTDIR/boot/grub/menu.lst else - echo "kernel $subdir/$VMLINUZ root=$PART_ROOT rootflags=$ROOTFLAGS rootfstype=$ROOTFS $RAIDARRAYS $CRYPTSETUP ro" | sed -e 's# # #g' | sed -e 's# # #g' >>${DESTDIR}/boot/grub/menu.lst + echo "kernel $subdir/$VMLINUZ root=$PART_ROOT rootflags=$ROOTFLAGS rootfstype=$ROOTFS $RAIDARRAYS $CRYPTSETUP ro" | sed -e 's# # #g' | sed -e 's# # #g' >>$DESTDIR/boot/grub/menu.lst fi - echo "initrd $subdir/$KERNELPKG-fallback.img" >>${DESTDIR}/boot/grub/menu.lst + echo "initrd $subdir/$KERNELPKG-fallback.img" >>$DESTDIR/boot/grub/menu.lst NUMBER=$(($NUMBER+1)) done ### TODO: # Is it possible to detect a windows installation? - echo "" >>${DESTDIR}/boot/grub/menu.lst - echo "# ($NUMBER) Windows" >>${DESTDIR}/boot/grub/menu.lst - echo "#title Windows" >>${DESTDIR}/boot/grub/menu.lst - echo "#rootnoverify (hd0,0)" >>${DESTDIR}/boot/grub/menu.lst - echo "#makeactive" >>${DESTDIR}/boot/grub/menu.lst - echo "#chainloader +1" >>${DESTDIR}/boot/grub/menu.lst + echo "" >>$DESTDIR/boot/grub/menu.lst + echo "# ($NUMBER) Windows" >>$DESTDIR/boot/grub/menu.lst + echo "#title Windows" >>$DESTDIR/boot/grub/menu.lst + echo "#rootnoverify (hd0,0)" >>$DESTDIR/boot/grub/menu.lst + echo "#makeactive" >>$DESTDIR/boot/grub/menu.lst + echo "#chainloader +1" >>$DESTDIR/boot/grub/menu.lst fi fi DIALOG --msgbox "Before installing GRUB, you must review the configuration file. You will now be put into the editor. After you save your changes and exit the editor, you can install GRUB." 0 0 geteditor || return 1 - $EDITOR ${DESTDIR}/boot/grub/menu.lst + $EDITOR $DESTDIR/boot/grub/menu.lst DEVS="$(findbootloaderdisks _)" DEVS="$DEVS $(findbootloaderpartitions _)" @@ -3559,7 +3559,7 @@ dogrub() { DIALOG --menu "Select the boot device where the GRUB bootloader will be installed (usually the MBR and not a partition)." 14 55 7 $DEVS 2>$ANSWER || return 1 ROOTDEV=$(cat $ANSWER) DIALOG --infobox "Installing the GRUB bootloader..." 0 0 - cp -a ${DESTDIR}/usr/lib/grub/i386-pc/* ${DESTDIR}/boot/grub/ + cp -a $DESTDIR/usr/lib/grub/i386-pc/* $DESTDIR/boot/grub/ # freeze xfs filesystems to enable grub installation on xfs filesystems freeze_xfs bootpart=$bootdev @@ -3579,7 +3579,7 @@ dogrub() { get_chs ### HACK:we need a dmraid hack here! http://bugs.gentoo.org/show_bug.cgi?id=275566 grub_dmraid_hack - ${DESTDIR}/sbin/grub --device-map=/tmp/dev.map --no-floppy --batch >>/tmp/grub.log 2>&1 <>/tmp/grub.log 2>&1 < $LOG fi bootdev="" @@ -3629,9 +3629,9 @@ dogrub2_common_before() { dogrub2_config() { - cp ${DESTDIR}/${GRUB2_PREFIX_DIR}/grub.cfg /tmp/.grub.cfg + cp $DESTDIR/${GRUB2_PREFIX_DIR}/grub.cfg /tmp/.grub.cfg # remove the default entries by truncating the file at our little tag (set default) - head -n $(cat /tmp/.grub.cfg | grep -n 'set default' | cut -d: -f 1) /tmp/.grub.cfg >${DESTDIR}/${GRUB2_PREFIX_DIR}/grub.cfg + head -n $(cat /tmp/.grub.cfg | grep -n 'set default' | cut -d: -f 1) /tmp/.grub.cfg >$DESTDIR/${GRUB2_PREFIX_DIR}/grub.cfg rm -f /tmp/.grub.cfg # keep the file from being completely bogus # if [[ "$grubdev" = "DEVICE NOT FOUND" ]]; then @@ -3640,7 +3640,7 @@ dogrub2_config() { # fi NUMBER=0 - cat << EOF >> ${DESTDIR}/${GRUB2_PREFIX_DIR}/grub.cfg + cat << EOF >> $DESTDIR/${GRUB2_PREFIX_DIR}/grub.cfg insmod part_gpt insmod part_msdos @@ -3658,7 +3658,7 @@ EOF if [[ "${GRUB2_EFI}" = "1" ]]; then - cat << EOF >> ${DESTDIR}/${GRUB2_PREFIX_DIR}/grub.cfg + cat << EOF >> $DESTDIR/${GRUB2_PREFIX_DIR}/grub.cfg insmod efi_gop insmod font @@ -3669,7 +3669,7 @@ EOF if [[ "${GRUB2_BIOS}" = "1" ]]; then - cat << EOF >> ${DESTDIR}/${GRUB2_PREFIX_DIR}/grub.cfg + cat << EOF >> $DESTDIR/${GRUB2_PREFIX_DIR}/grub.cfg insmod vbe insmod font @@ -3678,7 +3678,7 @@ EOF fi - cat << EOF >> ${DESTDIR}/${GRUB2_PREFIX_DIR}/grub.cfg + cat << EOF >> $DESTDIR/${GRUB2_PREFIX_DIR}/grub.cfg if loadfont \${prefix}/unicode.pf2 then @@ -3690,54 +3690,54 @@ fi EOF - echo "" >>${DESTDIR}/${GRUB2_PREFIX_DIR}/grub.cfg - sort /tmp/.device-names >>${DESTDIR}/${GRUB2_PREFIX_DIR}/grub.cfg + echo "" >>$DESTDIR/${GRUB2_PREFIX_DIR}/grub.cfg + sort /tmp/.device-names >>$DESTDIR/${GRUB2_PREFIX_DIR}/grub.cfg # create default grub entries - echo "" >>${DESTDIR}/${GRUB2_PREFIX_DIR}/grub.cfg - [[ "$USE_RAID" = "1" ]] && echo "insmod raid" >>${DESTDIR}/${GRUB2_PREFIX_DIR}/grub.cfg - ! [[ "$RAID_ON_LVM" = "" ]] && echo "insmod lvm" >>${DESTDIR}/${GRUB2_PREFIX_DIR}/grub.cfg - echo "# ($NUMBER) Arch Linux" >>${DESTDIR}/${GRUB2_PREFIX_DIR}/grub.cfg - echo "menuentry \"Arch Linux\" {" >>${DESTDIR}/${GRUB2_PREFIX_DIR}/grub.cfg + echo "" >>$DESTDIR/${GRUB2_PREFIX_DIR}/grub.cfg + [[ "$USE_RAID" = "1" ]] && echo "insmod raid" >>$DESTDIR/${GRUB2_PREFIX_DIR}/grub.cfg + ! [[ "$RAID_ON_LVM" = "" ]] && echo "insmod lvm" >>$DESTDIR/${GRUB2_PREFIX_DIR}/grub.cfg + echo "# ($NUMBER) Arch Linux" >>$DESTDIR/${GRUB2_PREFIX_DIR}/grub.cfg + echo "menuentry \"Arch Linux\" {" >>$DESTDIR/${GRUB2_PREFIX_DIR}/grub.cfg # if [[ "$FAIL_COMPLEX" = "0" ]]; then - # echo "set root=($grubdev)" >>${DESTDIR}/${GRUB2_PREFIX_DIR}/grub.cfg + # echo "set root=($grubdev)" >>$DESTDIR/${GRUB2_PREFIX_DIR}/grub.cfg # else - # echo "set root=$grubdev" >>${DESTDIR}/${GRUB2_PREFIX_DIR}/grub.cfg + # echo "set root=$grubdev" >>$DESTDIR/${GRUB2_PREFIX_DIR}/grub.cfg # fi - [[ "$FAIL_COMPLEX" = "0" ]] && echo "search --fs-uuid --set $complexuuid" >>${DESTDIR}/${GRUB2_PREFIX_DIR}/grub.cfg + [[ "$FAIL_COMPLEX" = "0" ]] && echo "search --fs-uuid --set $complexuuid" >>$DESTDIR/${GRUB2_PREFIX_DIR}/grub.cfg if [[ "$NAME_SCHEME_PARAMETER" = "UUID" || "$NAME_SCHEME_PARAMETER" = "LABEL" ]]; then - echo "linux (\${root})/$subdir/$VMLINUZ root=${_rootpart} rootflags=$ROOTFLAGS rootfstype=$ROOTFS $RAIDARRAYS $CRYPTSETUP ro nomodeset add_efi_memmap" | sed -e 's# # #g' | sed -e 's# # #g' >>${DESTDIR}/${GRUB2_PREFIX_DIR}/grub.cfg + echo "linux (\${root})/$subdir/$VMLINUZ root=${_rootpart} rootflags=$ROOTFLAGS rootfstype=$ROOTFS $RAIDARRAYS $CRYPTSETUP ro nomodeset add_efi_memmap" | sed -e 's# # #g' | sed -e 's# # #g' >>$DESTDIR/${GRUB2_PREFIX_DIR}/grub.cfg else - echo "linux (\${root})/$subdir/$VMLINUZ root=$PART_ROOT rootflags=$ROOTFLAGS rootfstype=$ROOTFS $RAIDARRAYS $CRYPTSETUP ro nomodeset add_efi_memmap" | sed -e 's# # #g' | sed -e 's# # #g' >>${DESTDIR}/${GRUB2_PREFIX_DIR}/grub.cfg + echo "linux (\${root})/$subdir/$VMLINUZ root=$PART_ROOT rootflags=$ROOTFLAGS rootfstype=$ROOTFS $RAIDARRAYS $CRYPTSETUP ro nomodeset add_efi_memmap" | sed -e 's# # #g' | sed -e 's# # #g' >>$DESTDIR/${GRUB2_PREFIX_DIR}/grub.cfg fi - echo "initrd (\${root})/$subdir/$KERNELPKG.img" >>${DESTDIR}/${GRUB2_PREFIX_DIR}/grub.cfg - echo "}" >>${DESTDIR}/${GRUB2_PREFIX_DIR}/grub.cfg - echo "" >>${DESTDIR}/${GRUB2_PREFIX_DIR}/grub.cfg + echo "initrd (\${root})/$subdir/$KERNELPKG.img" >>$DESTDIR/${GRUB2_PREFIX_DIR}/grub.cfg + echo "}" >>$DESTDIR/${GRUB2_PREFIX_DIR}/grub.cfg + echo "" >>$DESTDIR/${GRUB2_PREFIX_DIR}/grub.cfg # adding fallback/full image NUMBER=$(($NUMBER+1)) - echo "# ($NUMBER) Arch Linux" >>${DESTDIR}/${GRUB2_PREFIX_DIR}/grub.cfg - echo "menuentry \"Arch Linux Fallback\" {" >>${DESTDIR}/${GRUB2_PREFIX_DIR}/grub.cfg + echo "# ($NUMBER) Arch Linux" >>$DESTDIR/${GRUB2_PREFIX_DIR}/grub.cfg + echo "menuentry \"Arch Linux Fallback\" {" >>$DESTDIR/${GRUB2_PREFIX_DIR}/grub.cfg # if [[ "$FAIL_COMPLEX" = "0" ]]; then - # echo "set root=($grubdev)" >>${DESTDIR}/${GRUB2_PREFIX_DIR}/grub.cfg + # echo "set root=($grubdev)" >>$DESTDIR/${GRUB2_PREFIX_DIR}/grub.cfg # else - # echo "set root=$grubdev" >>${DESTDIR}/${GRUB2_PREFIX_DIR}/grub.cfg + # echo "set root=$grubdev" >>$DESTDIR/${GRUB2_PREFIX_DIR}/grub.cfg # fi - [[ "$FAIL_COMPLEX" = "0" ]] && echo "search --fs-uuid --set $complexuuid" >>${DESTDIR}/${GRUB2_PREFIX_DIR}/grub.cfg + [[ "$FAIL_COMPLEX" = "0" ]] && echo "search --fs-uuid --set $complexuuid" >>$DESTDIR/${GRUB2_PREFIX_DIR}/grub.cfg if [[ "$NAME_SCHEME_PARAMETER" = "UUID" || "$NAME_SCHEME_PARAMETER" = "LABEL" ]]; then - echo "linux (\${root})/$subdir/$VMLINUZ root=${_rootpart} rootflags=$ROOTFLAGS rootfstype=$ROOTFS $RAIDARRAYS $CRYPTSETUP ro nomodeset add_efi_memmap" | sed -e 's# # #g' | sed -e 's# # #g' >>${DESTDIR}/${GRUB2_PREFIX_DIR}/grub.cfg + echo "linux (\${root})/$subdir/$VMLINUZ root=${_rootpart} rootflags=$ROOTFLAGS rootfstype=$ROOTFS $RAIDARRAYS $CRYPTSETUP ro nomodeset add_efi_memmap" | sed -e 's# # #g' | sed -e 's# # #g' >>$DESTDIR/${GRUB2_PREFIX_DIR}/grub.cfg else - echo "linux (\${root})/$subdir/$VMLINUZ root=$PART_ROOT rootflags=$ROOTFLAGS rootfstype=$ROOTFS $RAIDARRAYS $CRYPTSETUP ro nomodeset add_efi_memmap" | sed -e 's# # #g' | sed -e 's# # #g' >>${DESTDIR}/${GRUB2_PREFIX_DIR}/grub.cfg + echo "linux (\${root})/$subdir/$VMLINUZ root=$PART_ROOT rootflags=$ROOTFLAGS rootfstype=$ROOTFS $RAIDARRAYS $CRYPTSETUP ro nomodeset add_efi_memmap" | sed -e 's# # #g' | sed -e 's# # #g' >>$DESTDIR/${GRUB2_PREFIX_DIR}/grub.cfg fi - echo "initrd (\${root})/$subdir/$KERNELPKG-fallback.img" >>${DESTDIR}/${GRUB2_PREFIX_DIR}/grub.cfg - echo "}" >>${DESTDIR}/${GRUB2_PREFIX_DIR}/grub.cfg + echo "initrd (\${root})/$subdir/$KERNELPKG-fallback.img" >>$DESTDIR/${GRUB2_PREFIX_DIR}/grub.cfg + echo "}" >>$DESTDIR/${GRUB2_PREFIX_DIR}/grub.cfg ### TODO: # Is it possible to detect a windows installation? NUMBER=$(($NUMBER+1)) - echo "" >>${DESTDIR}/${GRUB2_PREFIX_DIR}/grub.cfg - echo "## ($NUMBER) Windows" >>${DESTDIR}/${GRUB2_PREFIX_DIR}/grub.cfg - echo "#menuentry \"Windows\" {" >>${DESTDIR}/${GRUB2_PREFIX_DIR}/grub.cfg - echo "#set root=(hd0,3)" >>${DESTDIR}/${GRUB2_PREFIX_DIR}/grub.cfg - echo "#chainloader +1" >>${DESTDIR}/${GRUB2_PREFIX_DIR}/grub.cfg - echo "#}" >>${DESTDIR}/${GRUB2_PREFIX_DIR}/grub.cfg + echo "" >>$DESTDIR/${GRUB2_PREFIX_DIR}/grub.cfg + echo "## ($NUMBER) Windows" >>$DESTDIR/${GRUB2_PREFIX_DIR}/grub.cfg + echo "#menuentry \"Windows\" {" >>$DESTDIR/${GRUB2_PREFIX_DIR}/grub.cfg + echo "#set root=(hd0,3)" >>$DESTDIR/${GRUB2_PREFIX_DIR}/grub.cfg + echo "#chainloader +1" >>$DESTDIR/${GRUB2_PREFIX_DIR}/grub.cfg + echo "#}" >>$DESTDIR/${GRUB2_PREFIX_DIR}/grub.cfg } @@ -3754,9 +3754,9 @@ dogrub2_common_after() { # Edit grub.cfg config file DIALOG --msgbox "You must now review the grub2 configuration file.\n\nYou will now be put into the editor. After you save your changes and exit the editor, you can install GRUB2." 0 0 geteditor || return 1 - $EDITOR ${DESTDIR}/${GRUB2_PREFIX_DIR}/grub.cfg + $EDITOR $DESTDIR/${GRUB2_PREFIX_DIR}/grub.cfg - cp ${DESTDIR}/usr/share/grub/{unicode.pf2,ascii.pf2} ${DESTDIR}/${GRUB2_PREFIX_DIR}/ + cp $DESTDIR/usr/share/grub/{unicode.pf2,ascii.pf2} $DESTDIR/${GRUB2_PREFIX_DIR}/ GRUB2_BIOS="" GRUB2_EFI="" @@ -3767,8 +3767,8 @@ dogrub2_bios() { dogrub2_common_before - if [[ ! -f ${DESTDIR}/boot/grub/grub.cfg ]]; then - DIALOG --msgbox "Couldn't find ${DESTDIR}/boot/grub/grub.cfg, installing grub2-bios now ..." 0 0 + if [[ ! -f $DESTDIR/boot/grub/grub.cfg ]]; then + DIALOG --msgbox "Couldn't find $DESTDIR/boot/grub/grub.cfg, installing grub2-bios now ..." 0 0 PACKAGES="grub2-bios grub2-common" run_pacman # reset PACKAGES after installing @@ -3869,11 +3869,11 @@ dogrub2_bios() { # freeze and unfreeze xfs filesystems to enable grub2 installation on xfs filesystems freeze_xfs chroot_mount - chroot ${DESTDIR} /sbin/grub_bios-install --boot-directory=/boot --no-floppy --recheck ${bootdev} >> /tmp/grub2.log + chroot $DESTDIR /sbin/grub_bios-install --boot-directory=/boot --no-floppy --recheck ${bootdev} >> /tmp/grub2.log chroot_umount cat /tmp/grub2.log >${LOG} if ! [[ -s /tmp/grub2.log ]] ; then - DIALOG --msgbox "Error installing GRUB2.\n\nProbably you need to install it manually by chrooting into ${DESTDIR}.\nDon't forget to bind /dev and /proc into ${DESTDIR} before chrooting." 0 0 + DIALOG --msgbox "Error installing GRUB2.\n\nProbably you need to install it manually by chrooting into $DESTDIR.\nDon't forget to bind /dev and /proc into $DESTDIR before chrooting." 0 0 return 1 fi DIALOG --msgbox "GRUB2 was successfully installed." 0 0 @@ -3892,21 +3892,21 @@ dogrub2_efibootmgr() { EFIBOOTMGR="/usr/sbin/efibootmgr" - if [[ -d ${DESTDIR}/sys/firmware/efi/vars ]] + if [[ -d $DESTDIR/sys/firmware/efi/vars ]] then # Delete old entries of grub2 - needs to run within chroot - command to be checked - for bootnum in $(chroot ${DESTDIR} ${EFIBOOTMGR} | grep '^Boot[0-9]' | fgrep -i " grub2" | cut -b5-8) + for bootnum in $(chroot $DESTDIR ${EFIBOOTMGR} | grep '^Boot[0-9]' | fgrep -i " grub2" | cut -b5-8) do - chroot ${DESTDIR} ${EFIBOOTMGR} --bootnum "${bootnum}" --delete-bootnum + chroot $DESTDIR ${EFIBOOTMGR} --bootnum "${bootnum}" --delete-bootnum done - DISC=$(mount | grep ${DESTDIR}/boot/efi | cut -d' ' -f 1 | sed 's/\(.\{8\}\).*/\1/') + DISC=$(mount | grep $DESTDIR/boot/efi | cut -d' ' -f 1 | sed 's/\(.\{8\}\).*/\1/') - [[ "${DISC}" = "" ]] && DISC=$(mount | grep ${DESTDIR}/boot | cut -d' ' -f 1 | sed 's/\(.\{8\}\).*/\1/') + [[ "${DISC}" = "" ]] && DISC=$(mount | grep $DESTDIR/boot | cut -d' ' -f 1 | sed 's/\(.\{8\}\).*/\1/') [[ "${EFISYS_PART}" = "" ]] && EFISYS_PART_NUM=$(sgdisk -p ${DISC} | grep "EF00" | sed 's/\(.\{4\}\).*/\1/' | sed 's/^ *//;s/ *$//') - chroot ${DESTDIR} ${EFIBOOTMGR} --create --gpt --disk "${DISC}" --part "${EFISYS_PART_NUM}" --write-signature --label "GRUB2" --loader "\\EFI\\grub\\grub.efi" + chroot $DESTDIR ${EFIBOOTMGR} --create --gpt --disk "${DISC}" --part "${EFISYS_PART_NUM}" --write-signature --label "GRUB2" --loader "\\EFI\\grub\\grub.efi" fi chroot_umount @@ -3923,34 +3923,34 @@ dogrub2_efi_common() { # reset PACKAGES after installing PACKAGES="" - DISC=$(mount | grep ${DESTDIR}/boot/efi | cut -d' ' -f 1 | sed 's/\(.\{8\}\).*/\1/') + DISC=$(mount | grep $DESTDIR/boot/efi | cut -d' ' -f 1 | sed 's/\(.\{8\}\).*/\1/') if [[ "${DISC}" = "" ]]; then - DISC=$(mount | grep ${DESTDIR}/boot | cut -d' ' -f 1 | sed 's/\(.\{8\}\).*/\1/') + DISC=$(mount | grep $DESTDIR/boot | cut -d' ' -f 1 | sed 's/\(.\{8\}\).*/\1/') EFISYS="" fi parted_gpt - if [[ -d ${DESTDIR}/boot/efi ]]; then - EFISYS_PART=$(mount | grep ${DESTDIR}/boot/efi | cut -d' ' -f 1) + if [[ -d $DESTDIR/boot/efi ]]; then + EFISYS_PART=$(mount | grep $DESTDIR/boot/efi | cut -d' ' -f 1) else - mkdir -p ${DESTDIR}/boot/efi + mkdir -p $DESTDIR/boot/efi EFISYS_PART="" fi if [[ "${EFISYS_PART}" = "" ]]; then EFISYS_PART_NUM=$(sgdisk -p ${DISC} | grep "EF00" | sed 's/\(.\{4\}\).*/\1/' | sed 's/^ *//;s/ *$//') - mount -o rw -t vfat ${DISC}${EFISYS_PART_NUM} ${DESTDIR}/boot/efi + mount -o rw -t vfat ${DISC}${EFISYS_PART_NUM} $DESTDIR/boot/efi else - mount -o rw -t vfat ${EFISYS_PART} ${DESTDIR}/boot/efi + mount -o rw -t vfat ${EFISYS_PART} $DESTDIR/boot/efi fi chroot_mount - chroot ${DESTDIR} /sbin/grub_efi_${EFI_ARCH}-install --boot-directory=/boot/efi/efi --bootloader-id=grub --no-floppy --recheck >> /tmp/grub2_efi.log + chroot $DESTDIR /sbin/grub_efi_${EFI_ARCH}-install --boot-directory=/boot/efi/efi --bootloader-id=grub --no-floppy --recheck >> /tmp/grub2_efi.log - chroot ${DESTDIR} /bin/grub-mkimage --directory=/usr/lib/grub/${EFI_ARCH}-efi \ + chroot $DESTDIR /bin/grub-mkimage --directory=/usr/lib/grub/${EFI_ARCH}-efi \ --format=${EFI_ARCH}-efi \ --prefix="" \ --output=/boot/efi/efi/grub/grub_custom.efi \ @@ -3968,7 +3968,7 @@ dogrub2_efi_common() { chroot_umount cat /tmp/grub2_efi.log > ${LOG} if ! [[ -s /tmp/grub2_efi.log ]] ; then - DIALOG --msgbox "Error installing GRUB2.\n\nProbably you need to install it manually by chrooting into ${DESTDIR}.\nDon't forget to bind /dev, /sys and /proc into ${DESTDIR} before chrooting." 0 0 + DIALOG --msgbox "Error installing GRUB2.\n\nProbably you need to install it manually by chrooting into $DESTDIR.\nDon't forget to bind /dev, /sys and /proc into $DESTDIR before chrooting." 0 0 return 1 fi @@ -4081,7 +4081,7 @@ run_mkinitcpio() ( \ touch /tmp/setup-mkinitcpio-running echo "Initramfs progress ..." > /tmp/initramfs.log; echo >> /tmp/mkinitcpio.log - chroot ${DESTDIR} /sbin/mkinitcpio -p $KERNELPKG >>/tmp/mkinitcpio.log 2>&1 + chroot $DESTDIR /sbin/mkinitcpio -p $KERNELPKG >>/tmp/mkinitcpio.log 2>&1 echo >> /tmp/mkinitcpio.log rm -f /tmp/setup-mkinitcpio-running ) & @@ -4309,11 +4309,11 @@ auto_hwdetect() # check on ide-legacy boot parameter [[ "$(grep -w ide-legacy /proc/cmdline)" ]] && HWPARAMETER="$HWPARAMETER --ide-legacy" # check on used keymap - ! [[ "$(grep '^KEYMAP="us"' ${DESTDIR}/etc/rc.conf)" ]] && HWPARAMETER="$HWPARAMETER --keymap" + ! [[ "$(grep '^KEYMAP="us"' $DESTDIR/etc/rc.conf)" ]] && HWPARAMETER="$HWPARAMETER --keymap" # check on usb input [[ "$(grep hid /proc/modules)" ]] && HWPARAMETER="$HWPARAMETER --usbinput" # check on framebuffer modules and kms - if [[ -e ${DESTDIR}/lib/initcpio/hooks/v86d && "$(grep -w uvesafb /proc/cmdline)" ]]; then + if [[ -e $DESTDIR/lib/initcpio/hooks/v86d && "$(grep -w uvesafb /proc/cmdline)" ]]; then FBPARAMETER="--uvesafb" HWDETECTFILES="/etc/modprobe.d/uvesafb.conf" fi @@ -4333,19 +4333,19 @@ auto_hwdetect() if [[ "$(grep nfs /proc/modules)" ]]; then DIALOG --defaultno --yesno "Setup detected nfs driver...\nDo you need support for booting from nfs shares?" 0 0 && HWPARAMETER="$HWPARAMETER --nfs" fi - if [[ -e ${DESTDIR}/lib/initcpio/hooks/dmraid ]]; then + if [[ -e $DESTDIR/lib/initcpio/hooks/dmraid ]]; then if ! [[ "$(dmraid -r | grep ^no )" ]]; then HWPARAMETER="$HWPARAMETER --dmraid" fi fi [[ "$(blkid -c=/dev/null -o value -s TYPE $PART_ROOT)" = "btrfs" ]] && HWPARAMETER="$HWPARAMETER --btrfs" HWDETECTMODULES="$(echo $(hwdetect $FBPARAMETER --hostcontroller --filesystem $HWPARAMETER) | sed -e 's#.*\" ##g')" - HWDETECTHOOKS="$(hwdetect --rootdevice=$PART_ROOT --hooks-dir=${DESTDIR}/lib/initcpio/install $FBPARAMETER $HWPARAMETER --hooks)" + HWDETECTHOOKS="$(hwdetect --rootdevice=$PART_ROOT --hooks-dir=$DESTDIR/lib/initcpio/install $FBPARAMETER $HWPARAMETER --hooks)" HWDETECTRC="$(echo $(hwdetect --net --sound $HWPARAMETER)| sed -e 's#.*) ##g')" - [[ -n "$HWDETECTMODULES" ]] && sed -i -e "s/^MODULES=.*/$HWDETECTMODULES/g" ${DESTDIR}/etc/mkinitcpio.conf - [[ -n "$HWDETECTHOOKS" ]] && sed -i -e "s/^HOOKS=.*/$HWDETECTHOOKS/g" ${DESTDIR}/etc/mkinitcpio.conf - [[ -n "$HWDETECTFILES" ]] && sed -i -e "s#^FILES=.*#FILES=\"$HWDETECTFILES\"#g" ${DESTDIR}/etc/mkinitcpio.conf - [[ -n "$HWDETECTRC" ]] && sed -i -e "s/^MODULES=.*/$HWDETECTRC/g" ${DESTDIR}/etc/rc.conf + [[ -n "$HWDETECTMODULES" ]] && sed -i -e "s/^MODULES=.*/$HWDETECTMODULES/g" $DESTDIR/etc/mkinitcpio.conf + [[ -n "$HWDETECTHOOKS" ]] && sed -i -e "s/^HOOKS=.*/$HWDETECTHOOKS/g" $DESTDIR/etc/mkinitcpio.conf + [[ -n "$HWDETECTFILES" ]] && sed -i -e "s#^FILES=.*#FILES=\"$HWDETECTFILES\"#g" $DESTDIR/etc/mkinitcpio.conf + [[ -n "$HWDETECTRC" ]] && sed -i -e "s/^MODULES=.*/$HWDETECTRC/g" $DESTDIR/etc/rc.conf fi } @@ -4354,14 +4354,14 @@ auto_fb() UVESAFB="" if [[ "$(grep -w ati-kms /proc/cmdline)" || "$(grep -w intel-kms /proc/cmdline)" || "$(grep -w nvidia-kms /proc/cmdline)" ]]; then # clean modprobe.conf file from options first - sed -i -e '/options/d' ${DESTDIR}/etc/modprobe.d/modprobe.conf - ! [[ "$(grep nouveau ${DESTDIR}/etc/modprobe.d/modprobe.conf)" ]] && grep ^[a-z] /etc/modprobe.d/modprobe.conf >> ${DESTDIR}/etc/modprobe.d/modprobe.conf - ! [[ "$(grep i915 ${DESTDIR}/etc/modprobe.d/modprobe.conf)" ]] && grep ^[a-z] /etc/modprobe.d/modprobe.conf >> ${DESTDIR}/etc/modprobe.d/modprobe.conf - ! [[ "$(grep radeon ${DESTDIR}/etc/modprobe.d/modprobe.conf)" ]] && grep ^[a-z] /etc/modprobe.d/modprobe.conf >> ${DESTDIR}/etc/modprobe.d/modprobe.conf + sed -i -e '/options/d' $DESTDIR/etc/modprobe.d/modprobe.conf + ! [[ "$(grep nouveau $DESTDIR/etc/modprobe.d/modprobe.conf)" ]] && grep ^[a-z] /etc/modprobe.d/modprobe.conf >> $DESTDIR/etc/modprobe.d/modprobe.conf + ! [[ "$(grep i915 $DESTDIR/etc/modprobe.d/modprobe.conf)" ]] && grep ^[a-z] /etc/modprobe.d/modprobe.conf >> $DESTDIR/etc/modprobe.d/modprobe.conf + ! [[ "$(grep radeon $DESTDIR/etc/modprobe.d/modprobe.conf)" ]] && grep ^[a-z] /etc/modprobe.d/modprobe.conf >> $DESTDIR/etc/modprobe.d/modprobe.conf fi - if [[ -e ${DESTDIR}/lib/initcpio/hooks/v86d && "$(grep -w uvesafb /proc/cmdline)" ]]; then + if [[ -e $DESTDIR/lib/initcpio/hooks/v86d && "$(grep -w uvesafb /proc/cmdline)" ]]; then UVESAFB="$(grep ^[a-z] /etc/modprobe.d/uvesafb.conf)" - sed -i -e "s#options.*#$UVESAFB#g" ${DESTDIR}/etc/modprobe.d/uvesafb.conf + sed -i -e "s#options.*#$UVESAFB#g" $DESTDIR/etc/modprobe.d/uvesafb.conf fi } @@ -4369,40 +4369,40 @@ auto_parameters() { if [[ -s /tmp/.keymap ]]; then DIALOG --infobox "Setting the keymap: $(cat /tmp/.keymap | sed -e 's/\..*//g') in rc.conf ..." 0 0 - sed -i -e "s/^KEYMAP=.*/KEYMAP=\"$(cat /tmp/.keymap | sed -e 's/\..*//g')\"/g" ${DESTDIR}/etc/rc.conf + sed -i -e "s/^KEYMAP=.*/KEYMAP=\"$(cat /tmp/.keymap | sed -e 's/\..*//g')\"/g" $DESTDIR/etc/rc.conf fi if [[ -s /tmp/.font ]]; then DIALOG --infobox "Setting the consolefont: $(cat /tmp/.font | sed -e 's/\..*//g') in rc.conf ..." 0 0 - sed -i -e "s/^CONSOLEFONT=.*/CONSOLEFONT=\"$(cat /tmp/.font | sed -e 's/\..*//g')\"/g" ${DESTDIR}/etc/rc.conf + sed -i -e "s/^CONSOLEFONT=.*/CONSOLEFONT=\"$(cat /tmp/.font | sed -e 's/\..*//g')\"/g" $DESTDIR/etc/rc.conf fi if [[ -s /tmp/.hardwareclock ]]; then DIALOG --infobox "Setting the hardwareclock: $(cat /tmp/.hardwareclock | sed -e 's/\..*//g') in rc.conf ..." 0 0 - sed -i -e "s/^HARDWARECLOCK=.*/HARDWARECLOCK=\"$(cat /tmp/.hardwareclock | sed -e 's/\..*//g')\"/g" ${DESTDIR}/etc/rc.conf + sed -i -e "s/^HARDWARECLOCK=.*/HARDWARECLOCK=\"$(cat /tmp/.hardwareclock | sed -e 's/\..*//g')\"/g" $DESTDIR/etc/rc.conf fi if [[ -s /tmp/.timezone ]]; then DIALOG --infobox "Setting the timezone: $(cat /tmp/.timezone | sed -e 's/\..*//g') in rc.conf ..." 0 0 - sed -i -e "s#^TIMEZONE=.*#TIMEZONE=\"$(cat /tmp/.timezone | sed -e 's/\..*//g')\"#g" ${DESTDIR}/etc/rc.conf + sed -i -e "s#^TIMEZONE=.*#TIMEZONE=\"$(cat /tmp/.timezone | sed -e 's/\..*//g')\"#g" $DESTDIR/etc/rc.conf fi } auto_luks() { - if [[ -e /tmp/.crypttab && "$(grep -v '^#' ${DESTDIR}/etc/crypttab)" = "" ]]; then + if [[ -e /tmp/.crypttab && "$(grep -v '^#' $DESTDIR/etc/crypttab)" = "" ]]; then sed -i -e "/$(basename ${PART_ROOT})/d" /tmp/.crypttab - cat /tmp/.crypttab >> ${DESTDIR}/etc/crypttab + cat /tmp/.crypttab >> $DESTDIR/etc/crypttab fi } auto_timesetting() { TIMEZONE="" - eval $(grep "^TIMEZONE" ${DESTDIR}/etc/rc.conf) - if [[ "$TIMEZONE" != "" && -e ${DESTDIR}/usr/share/zoneinfo/$TIMEZONE ]]; then - cp ${DESTDIR}/usr/share/zoneinfo/$TIMEZONE ${DESTDIR}/etc/localtime - cp ${DESTDIR}/usr/share/zoneinfo/$TIMEZONE /etc/localtime + eval $(grep "^TIMEZONE" $DESTDIR/etc/rc.conf) + if [[ "$TIMEZONE" != "" && -e $DESTDIR/usr/share/zoneinfo/$TIMEZONE ]]; then + cp $DESTDIR/usr/share/zoneinfo/$TIMEZONE $DESTDIR/etc/localtime + cp $DESTDIR/usr/share/zoneinfo/$TIMEZONE /etc/localtime fi - if [[ ! -f ${DESTDIR}/var/lib/hwclock/adjtime ]]; then - echo "0.0 0 0.0" > ${DESTDIR}/var/lib/hwclock/adjtime + if [[ ! -f $DESTDIR/var/lib/hwclock/adjtime ]]; then + echo "0.0 0 0.0" > $DESTDIR/var/lib/hwclock/adjtime fi } @@ -4412,8 +4412,8 @@ auto_ftpmirror() # add installer-selected mirror to the top of the mirrorlist if [[ "$MODE" = "ftp" && "${SYNC_URL}" != "" ]]; then SYNC_URL="${SYNC_URL}" - awk "BEGIN { printf(\"# Mirror used during installation\nServer = "${SYNC_URL}"\n\n\") } 1 " "${DESTDIR}/etc/pacman.d/mirrorlist" > /tmp/inst-mirrorlist - mv /tmp/inst-mirrorlist "${DESTDIR}/etc/pacman.d/mirrorlist" + awk "BEGIN { printf(\"# Mirror used during installation\nServer = "${SYNC_URL}"\n\n\") } 1 " "$DESTDIR/etc/pacman.d/mirrorlist" > /tmp/inst-mirrorlist + mv /tmp/inst-mirrorlist "$DESTDIR/etc/pacman.d/mirrorlist" fi } @@ -4467,27 +4467,27 @@ configure_system() # (feel free to prove me wrong :)) # we could maybe do this just once after the user is really done here, but then he doesn't get # to see the updated file while being in this menu... - HOSTNAME=$(sed -n '/^HOSTNAME/s/HOSTNAME=//p' ${DESTDIR}${FILE} | sed 's/"//g') - if ! [[ "$(grep '127\.0\.0\.1' ${DESTDIR}/etc/hosts | grep -q "$HOSTNAME")" ]]; then - sed -i "s/127\.0\.0\.1.*/& $HOSTNAME/" ${DESTDIR}/etc/hosts + HOSTNAME=$(sed -n '/^HOSTNAME/s/HOSTNAME=//p' $DESTDIR${FILE} | sed 's/"//g') + if ! [[ "$(grep '127\.0\.0\.1' $DESTDIR/etc/hosts | grep -q "$HOSTNAME")" ]]; then + sed -i "s/127\.0\.0\.1.*/& $HOSTNAME/" $DESTDIR/etc/hosts fi - $EDITOR ${DESTDIR}${FILE} + $EDITOR $DESTDIR${FILE} elif [[ "$FILE" = "/etc/mkinitcpio.conf" ]]; then # non-file DIALOG --msgbox "The mkinitcpio.conf file controls which modules will be placed into the initramfs for your system's kernel.\n\n- Non US keymap users should add 'keymap' to HOOKS= array\n- USB keyboard users should add 'usbinput' to HOOKS= array\n- If you install under VMWARE add 'BusLogic' to MODULES= array\n- raid, lvm2, encrypt are not enabled by default\n- 2 or more disk controllers, please specify the correct module\n loading order in MODULES= array \n\nMost of you will not need to change anything in this file." 18 70 HOOK_ERROR="" - $EDITOR ${DESTDIR}${FILE} - for i in $(cat ${DESTDIR}/etc/mkinitcpio.conf | grep ^HOOKS | sed -e 's/"//g' -e 's/HOOKS=//g'); do - [[ -e ${DESTDIR}/lib/initcpio/install/$i ]] || HOOK_ERROR=1 + $EDITOR $DESTDIR${FILE} + for i in $(cat $DESTDIR/etc/mkinitcpio.conf | grep ^HOOKS | sed -e 's/"//g' -e 's/HOOKS=//g'); do + [[ -e $DESTDIR/lib/initcpio/install/$i ]] || HOOK_ERROR=1 done if [[ "$HOOK_ERROR" = "1" ]]; then DIALOG --msgbox "ERROR: Detected error in 'HOOKS=' line, please correct HOOKS= in /etc/mkinitcpio.conf!" 18 70 fi elif [[ "$FILE" = "/etc/locale.gen" ]]; then # non-file # enable glibc locales from rc.conf - for i in $(grep "^LOCALE" ${DESTDIR}/etc/rc.conf | sed -e 's/.*="//g' -e's/\..*//g'); do - sed -i -e "s/^#$i/$i/g" ${DESTDIR}/etc/locale.gen + for i in $(grep "^LOCALE" $DESTDIR/etc/rc.conf | sed -e 's/.*="//g' -e's/\..*//g'); do + sed -i -e "s/^#$i/$i/g" $DESTDIR/etc/locale.gen done - $EDITOR ${DESTDIR}${FILE} + $EDITOR $DESTDIR${FILE} elif [[ "$FILE" = "Root-Password" ]]; then # non-file PASSWORD="" while [[ "${PASSWORD}" = "" ]]; do @@ -4504,10 +4504,10 @@ configure_system() DIALOG --msgbox "Password didn't match, please enter again." 0 0 fi done - chroot ${DESTDIR} passwd root < /tmp/.password + chroot $DESTDIR passwd root < /tmp/.password rm /tmp/.password else #regular file - $EDITOR ${DESTDIR}${FILE} + $EDITOR $DESTDIR${FILE} fi done if [[ $S_CONFIG -eq 1 ]]; then @@ -4518,7 +4518,7 @@ configure_system() # /etc/initcpio.conf run_mkinitcpio # /etc/locale.gen - chroot ${DESTDIR} locale-gen >/dev/null 2>&1 + chroot $DESTDIR locale-gen >/dev/null 2>&1 ## END POSTPROCESSING ## NEXTITEM="7" fi