root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 12:00:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

silence blockdevice checks, fix proc umount

Browse source
This commit is contained in:
Tobias Powalowski 2014-08-02 11:16:12 +02:00
parent 2a289ffdaf
commit 5a8fc03216
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
usr/share/archboot/installer/setup
View file

@ -109,6 +109,7 @@ chroot_mount()
[[ -e "${DESTDIR}/sys" ]] || mkdir -m 555 "${DESTDIR}/sys" [[ -e "${DESTDIR}/sys" ]] || mkdir -m 555 "${DESTDIR}/sys"
[[ -e "${DESTDIR}/dev" ]] || mkdir -m 755 "${DESTDIR}/dev" [[ -e "${DESTDIR}/dev" ]] || mkdir -m 755 "${DESTDIR}/dev"
mount --make-runbindable /sys/fs/cgroup mount --make-runbindable /sys/fs/cgroup
mount --make-runbindable /proc/sys/fs/binfmt_misc
mount --rbind "/proc" "${DESTDIR}/proc" mount --rbind "/proc" "${DESTDIR}/proc"
mount --rbind "/sys" "${DESTDIR}/sys" mount --rbind "/sys" "${DESTDIR}/sys"
mount --rbind "/dev" "${DESTDIR}/dev" mount --rbind "/dev" "${DESTDIR}/dev"
@ -123,6 +124,7 @@ chroot_umount()
umount -R "${DESTDIR}/sys" umount -R "${DESTDIR}/sys"
umount -R "${DESTDIR}/dev" umount -R "${DESTDIR}/dev"
mount --make-rshared /sys/fs/cgroup mount --make-rshared /sys/fs/cgroup
mount --make-rshared /proc/sys/fs/binfmt_misc
} }
getfstype() getfstype()
@ -405,6 +407,8 @@ blockdevices() {
# lists linux blockdevice partitions # lists linux blockdevice partitions
blockdevices_partitions() { blockdevices_partitions() {
# all available block devices partitions # all available block devices partitions
# printk off needed cause of parted usage
printk off
for part in $(${_LSBLK} NAME,TYPE | grep "part$"| cut -d' ' -f1); do for part in $(${_LSBLK} NAME,TYPE | grep "part$"| cut -d' ' -f1); do
# exclude checks: # exclude checks:
#- part of raid device #- part of raid device
@ -426,6 +430,7 @@ blockdevices_partitions() {
[[ "${1}" ]] && echo ${1} [[ "${1}" ]] && echo ${1}
fi fi
done done
printk on
} }
# list none partitionable raid md devices # list none partitionable raid md devices
@ -1698,6 +1703,7 @@ autoprepare() {
DOSUBVOLUME="no" DOSUBVOLUME="no"
fi fi
BTRFS_LEVEL="NONE" BTRFS_LEVEL="NONE"
### TODO: SWAP CHECK MISSING
DIALOG --infobox "Creating ${FSTYPE} on ${PART}\nwith FSLABEL ${LABEL_NAME} ,\nmounting to ${DESTDIR}${MP}" 0 0 DIALOG --infobox "Creating ${FSTYPE} on ${PART}\nwith FSLABEL ${LABEL_NAME} ,\nmounting to ${DESTDIR}${MP}" 0 0
_mkfs ${DOMKFS} ${PART} ${FSTYPE} ${DESTDIR} ${MP} ${LABEL_NAME} ${FS_OPTIONS} ${BTRFS_DEVICES} ${BTRFS_LEVEL} ${BTRFS_SUBVOLUME} ${DOSUBVOLUME} ${BTRFS_COMPRESS} || return 1 _mkfs ${DOMKFS} ${PART} ${FSTYPE} ${DESTDIR} ${MP} ${LABEL_NAME} ${FS_OPTIONS} ${BTRFS_DEVICES} ${BTRFS_LEVEL} ${BTRFS_SUBVOLUME} ${DOSUBVOLUME} ${BTRFS_COMPRESS} || return 1
sleep 1 sleep 1
@ -3966,8 +3972,10 @@ do_syslinux_bios() {
sgdisk ${ROOTDEV} --attributes=${PARTITION_NUMBER}:set:2 sgdisk ${ROOTDEV} --attributes=${PARTITION_NUMBER}:set:2
fi fi
else else
printk off
# mark the partition with /boot as active in MBR # mark the partition with /boot as active in MBR
parted -s ${ROOTDEV} set ${PARTITION_NUMBER} boot on >${LOG} parted -s ${ROOTDEV} set ${PARTITION_NUMBER} boot on >${LOG}
printk on
fi fi
## install syslinux/extlinux bios ## install syslinux/extlinux bios