Archives/manjaro-architect
2
0
Fork 0
mirror of https://gitlab.manjaro.org/applications/manjaro-architect synced 2024-11-09 19:11:02 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Chrysostomus/manjaro-architect

Browse Source
This commit is contained in:
Bernhard Landauer 2017-02-28 20:08:09 +01:00
commit a8f29db79a
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/util-base.sh
View File

@ -328,7 +328,7 @@ install_base() {
# If the virtual console has been set, then copy config file to installation # If the virtual console has been set, then copy config file to installation
if [[ -e /tmp/vconsole.conf ]]; then if [[ -e /tmp/vconsole.conf ]]; then
cp -f /tmp/vconsole.conf ${MOUNTPOINT}/etc/vconsole.conf cp -f /tmp/vconsole.conf ${MOUNTPOINT}/etc/vconsole.conf
check_for_error "copy vconsole.conf" $ install_base check_for_error "copy vconsole.conf" $? install_base
fi fi
# If specified, copy over the pacman.conf file to the installation # If specified, copy over the pacman.conf file to the installation

2
lib/util-disk.sh
View File

@ -227,10 +227,8 @@ select_filesystem() {
DIALOG " $_FSTitle " --menu "$_FSBody" 0 0 12 \ DIALOG " $_FSTitle " --menu "$_FSBody" 0 0 12 \
"$_FSSkip" "-" \ "$_FSSkip" "-" \
"btrfs" "mkfs.btrfs -f" \ "btrfs" "mkfs.btrfs -f" \
"ext2" "mkfs.ext2 -q" \
"ext3" "mkfs.ext3 -q" \ "ext3" "mkfs.ext3 -q" \
"ext4" "mkfs.ext4 -q" \ "ext4" "mkfs.ext4 -q" \
"f2fs" "mkfs.f2fs -q" \
"jfs" "mkfs.jfs -q" \ "jfs" "mkfs.jfs -q" \
"nilfs2" "mkfs.nilfs2 -fq" \ "nilfs2" "mkfs.nilfs2 -fq" \
"ntfs" "mkfs.ntfs -q" \ "ntfs" "mkfs.ntfs -q" \