summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-03-24 17:27:33 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-03-24 17:29:03 +0000
commit20a9a27018f8c68c5b01a41f3d66e4920bd50049 (patch)
tree1987b324262da9647babf3d53fd25b8dffa794cd
parent687c4927e74043de29d0f0ab9c3ae44086064954 (diff)
downloadalpine-conf-20a9a27018f8c68c5b01a41f3d66e4920bd50049.tar.bz2
alpine-conf-20a9a27018f8c68c5b01a41f3d66e4920bd50049.tar.xz
setup-disk: use ext4 for / and /boot by default
ref #558
-rw-r--r--setup-disk.in11
1 files changed, 6 insertions, 5 deletions
diff --git a/setup-disk.in b/setup-disk.in
index e6893f8..b8132e9 100644
--- a/setup-disk.in
+++ b/setup-disk.in
@@ -347,7 +347,8 @@ useall() {
local swap_size=$(find_swap_size) swap_part_type="82"
local root_part_type="83"
local raidpkg= partitions=
- local minimum_root_size=$(($boot_size * 2));
+ local minimum_root_size=$(($boot_size * 2))
+ local rootfs=ext4 bootfs=ext4
if [ -n "$USE_RAID" ]; then
boot_part_type="fd"
@@ -430,15 +431,15 @@ EOF
esac
done
fi
- mkfs.ext3 -q $boot_dev >/dev/null \
+ mkfs.$bootfs -q $boot_dev >/dev/null \
&& mkswap $swap_dev >/dev/null \
- && mkfs.ext3 -q >/dev/null $root_dev \
+ && mkfs.$rootfs -q >/dev/null $root_dev \
|| return 1
mkdir -p /mnt
- mount -t ext3 $root_dev /mnt || return 1
+ mount -t $rootfs $root_dev /mnt || return 1
mkdir -p /mnt/boot
- mount -t ext3 $boot_dev /mnt/boot || return 1
+ mount -t $bootfs $boot_dev /mnt/boot || return 1
if [ -n "$USE_RAID" ]; then
mdadm --detail --scan > /etc/mdadm.conf
rc-update --quiet add mdadm-raid boot