Skip to content

Commit bc7513d

Browse files
committed
added bo/eo exports
1 parent 19dcbc7 commit bc7513d

File tree

1 file changed

+17
-8
lines changed

1 file changed

+17
-8
lines changed

scripts/zfs/install/02-install.sh

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,16 @@ function _main ()
4242
local PATH_TO_THE_LOCAL_INSTALL_CONF="${PATH_TO_THIS_SCRIPT}/install.conf"
4343
local PATH_TO_THE_DIST_INSTALL_CONF="${PATH_TO_THIS_SCRIPT}/install.dist.conf"
4444

45-
#bo: sourcing install configuration files
45+
echo ":: bo sourcing configuration files "
4646
if [[ -f "${PATH_TO_THE_DIST_INSTALL_CONF}" ]];
4747
then
48-
echo ":: Sourcing >>install.dist.conf<<."
48+
echo " Sourcing >>install.dist.conf<<."
4949
. "${PATH_TO_THE_DIST_INSTALL_CONF}"
5050
fi
5151

5252
if [[ -f "${PATH_TO_THE_LOCAL_INSTALL_CONF}" ]];
5353
then
54-
echo ":: Sourcing >>install.conf<<."
54+
echo " Sourcing >>install.conf<<."
5555
. "${PATH_TO_THE_LOCAL_INSTALL_CONF}"
5656
fi
5757
#bo: sourcing install configuration files
@@ -64,7 +64,9 @@ function _main ()
6464

6565
exit 1
6666
fi
67+
echo ":: eo sourcing configuration files "
6768

69+
echo ":: bo installing base packages"
6870
# Root dataset
6971
root_dataset=$(cat /tmp/root_dataset)
7072

@@ -93,7 +95,9 @@ function _main ()
9395
vim \
9496
git \
9597
ansible
98+
echo ":: eo installing base packages"
9699

100+
echo ":: bo creating etc files"
97101
# Generate fstab excluding ZFS entries
98102
print ":: Generate fstab excluding ZFS entries"
99103
genfstab -U /mnt | grep -v "${zpoolname}" | tr -s '\n' | sed 's/\/mnt//' > /mnt/etc/fstab
@@ -113,10 +117,12 @@ EOF
113117
# Prepare locales
114118
sed -i 's/#\('"${locale}"'.UTF-8\)/\1/' /mnt/etc/locale.gen
115119
echo 'LANG="'"${locale}"'.UTF-8"' > /mnt/etc/locale.conf
120+
echo ":: eo creating etc files"
116121

122+
echo ":: bo initramfs"
117123
# Prepare initramfs
118124
print ":: Prepare initramfs"
119-
if lspci | grep ' VGA ' | grep -q -i intel
125+
if lspci | grep -i 'VGA' | grep -q -i intel
120126
then
121127
modules="i915 intel_agp"
122128
else
@@ -146,7 +152,9 @@ PRESETS=('default')
146152
default_image="/boot/initramfs-linux.img"
147153
EOF
148154
fi
155+
echo ":: eo initramfs"
149156

157+
echo ":: bo copy zfs files"
150158
print ":: Copy ZFS files"
151159
cp /etc/hostid /mnt/etc/hostid
152160
cp /etc/zfs/zpool.cache /mnt/etc/zfs/zpool.cache
@@ -163,13 +171,13 @@ EOF
163171
rm -fr /mnt/home/$user
164172
fi
165173
fi
174+
echo ":: eo copy zfs files"
166175

167-
print ":: Configure timezone"
176+
echo ":: bo timedate configuration"
168177
timedatectl set-ntp true
178+
echo ":: eo timedate configuration"
169179

170-
# Chroot and configure
171-
print ":: Chroot and configure system"
172-
180+
echo ":: bo chroot configuration"
173181
arch-chroot /mnt /bin/bash -xe <<EOF
174182
175183
### Reinit keyring
@@ -234,6 +242,7 @@ EOSF
234242
chown -R ${user}:${user} /home/${user}
235243
236244
EOF
245+
echo ":: eo chroot configuration"
237246

238247
# Set root passwd
239248
print ":: Set root password"

0 commit comments

Comments
 (0)