Skip to content

Commit 37b126c

Browse files
pavroopavroo
committed
20240122.1
1 parent ca92041 commit 37b126c

File tree

4 files changed

+66
-52
lines changed

4 files changed

+66
-52
lines changed

‎7/CHANGELOG‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
-------------------------------------------------------------------------------
2+
Version 20240122.1~sparky7~0 (2024-01-22)
3+
-------------------------------------------------------------------------------
4+
* Small fix
5+
16
-------------------------------------------------------------------------------
27
Version 20240122~sparky7~0 (2024-01-22)
38
-------------------------------------------------------------------------------

‎7/bin/sparky-installer‎

Lines changed: 52 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# sparky-installer has been forked
99
# for SparkyLinux by pavroo <[email protected]> 2013/08/04
1010
# Copyright 2013-2024 Under the GNU GPL2 License
11-
# Last update 2024/01/08 by pavroo
11+
# Last update 2024/01/22.1 by pavroo
1212

1313
# checking to make sure script is running with root privileges
1414
testroot="`whoami`"
@@ -71,16 +71,6 @@ fi
7171
# get default's locale file (english only)
7272
DEFLOCDIR="/usr/share/sparky/sparky-advanced-installer"
7373
. $DEFLOCDIR/en
74-
75-
### TODO
76-
#ask for testing dev installer
77-
#$DIALOG $TITLE"$TITLETEXT" $YESNO $TEXT"$LOCAL129\n\n$LOCAL130" $HEIGHT $WIDTH
78-
#if [ $? = 0 ]; then
79-
# echo "using the standard installer"
80-
#else
81-
# sparky-installer-dev
82-
# exit 0
83-
#fi
8474

8575
# the first dialog window
8676
if [ -f /lib/live/mount/medium/live/minimal ] || [ "$CHECKMINI" != "" ]; then
@@ -92,9 +82,9 @@ else
9282
fi
9383

9484
if [ "$TESTEFI" != "" ]; then
95-
PARTITIONTEXT="$LOCAL9\n\n$PARTITIONPROG $LOCAL10\n\n$LOCAL11\n\n$LOCAL12\n\n$LOCAL13 $PARTITIONPROG $LOCAL14\n\n$LOCAL15"
85+
PARTITIONTEXT="$LOCAL9\n\n$PARTITIONPROG $LOCAL10\n\n$LOCAL11\n\n$LOCAL133\n\n$LOCAL12\n\n$LOCAL13 $PARTITIONPROG $LOCAL14\n\n$LOCAL15"
9686
else
97-
PARTITIONTEXT="$LOCAL9\n\n$PARTITIONPROG $LOCAL10\n\n$LOCAL11\n\n$LOCAL13 $PARTITIONPROG $LOCAL14\n\n$LOCAL15"
87+
PARTITIONTEXT="$LOCAL9\n\n$PARTITIONPROG $LOCAL10\n\n$LOCAL11\n\n$LOCAL133\n\n$LOCAL13 $PARTITIONPROG $LOCAL14\n\n$LOCAL15"
9888
fi
9989

10090
. /etc/live/config.conf
@@ -243,7 +233,7 @@ if [ "$TARGETPART" = "Exit" ]; then
243233
exit 1
244234
fi
245235

246-
#choose filesystem type
236+
#choose filesystem type to root partition
247237
$DIALOG $TITLE"$TITLETEXT" $MENU $TEXT"$LOCAL32" $HEIGHT $WIDTH $MENUHEIGHT btrfs "Btrfs $LOCAL33" ext2 "Ext2 $LOCAL33" ext3 "Ext3 $LOCAL33" ext4 "Ext4 $LOCAL33" xfs "Xfs $LOCAL33" 2>/tmp/choice.$$
248238

249239
if [ "$?" = "0" ]; then
@@ -254,7 +244,7 @@ fi
254244

255245
rm /tmp/choice.$$
256246

257-
#HOMEINST=`echo $PARTINST | sed -r "s/$TARGETPART://"`
247+
# choose home partition
258248
if [ "$TARGETEFI" != "" ]; then
259249
HOMEINST=`blkid | grep -v "loop" | grep -v "sr0" | awk '{print $1}' | cut -f3 -d"/" | grep "[0-9]" | grep -v "$TARGETEFI" | grep -v "$SWAP" | grep -v "$TARGETPART" | cut -f1 -d":"`
260250
else
@@ -277,6 +267,7 @@ fi
277267

278268
rm /tmp/choice.$$
279269

270+
# choose file system to home partition
280271
if [ "$HOMEPART" != "root" ]; then
281272
#choose filesystem type
282273
$DIALOG $TITLE"$TITLETEXT" $MENU $TEXT"$LOCAL37" $HEIGHT $WIDTH $MENUHEIGHT noformat "$LOCAL38" btrfs "Btrfs $LOCAL33" ext2 "Ext2 $LOCAL33" ext3 "Ext3 $LOCAL33" ext4 "Ext4 $LOCAL33" xfs "Xfs $LOCAL33" 2>/tmp/choice.$$
@@ -291,6 +282,30 @@ if [ "$HOMEPART" != "root" ]; then
291282

292283
fi
293284

285+
# choose boot partition
286+
if [ "$TARGETEFI" != "" ]; then
287+
BOOTINST=`blkid | grep -v "loop" | grep -v "sr0" | awk '{print $1}' | cut -f3 -d"/" | grep "[0-9]" | grep -v "$TARGETEFI" | grep -v "$SWAP" | grep -v "$TARGETPART" | grep -v "$HOMEPART" | cut -f1 -d":"`
288+
else
289+
BOOTINST=`blkid | grep -v "loop" | grep -v "sr0" | awk '{print $1}' | cut -f3 -d"/" | grep "[0-9]" | grep -v "$SWAP" | grep -v "$TARGETPART" | grep -v "$HOMEPART" | cut -f1 -d":"`
290+
fi
291+
292+
for i in $BOOTINST; do
293+
bootpart="$i"
294+
bootpartsize=`grep -m 1 "$i" /proc/partitions | awk '{print $3}'`
295+
bootpartmenu="$bootpartmenu $bootpart $bootpartsize"
296+
done
297+
298+
$DIALOG $TITLE"$TITLETEXT" $MENU $TEXT"$LOCAL132" $HEIGHT $WIDTH $MENUHEIGHT NoBoot "$LOCAL134" $bootpartmenu 2>/tmp/choice.$$
299+
300+
if [ "$?" = "0" ]; then
301+
BOOTPART=`cat /tmp/choice.$$`
302+
BOOTFSTYPE="ext4"
303+
else
304+
BOOTPART="NoBoot"
305+
fi
306+
307+
rm /tmp/choice.$$
308+
294309
# set partitions with no ":"
295310
if [ "$TESTEFI" != "" ]; then
296311
TARGETEFI=`echo $TARGETEFI | cut -f1 -d":"`
@@ -668,6 +683,20 @@ if [ "$HOMEPART" != "root" ]; then
668683
fi
669684
fi
670685

686+
# make /boot partition if separated
687+
if [ "$BOOTPART" != "NoBoot" ]; then
688+
if [ "`mount | grep $BOOTPART`" ]; then
689+
echo "$LOCAL94"
690+
umount /dev/$BOOTPART
691+
fi
692+
mke2fs -t ext4 -F /dev/$BOOTPART
693+
echo "$LOCAL135"
694+
mkdir -p /TARGET/boot
695+
mount /dev/$BOOTPART /TARGET/boot -o rw
696+
rm -rf "/TARGET/boot/lost+found"
697+
sleep 1
698+
fi
699+
671700
#format and mount efi part
672701
if [ "$TESTEFI" != "" ]; then
673702
if [ "$FORMATEFIPART" = "formatefi" ]; then
@@ -728,6 +757,8 @@ TARGETEFI=$TARGETEFI
728757
FORMATEFIPART=$FORMATEFIPART
729758
HFSTYPE=$HFSTYPE
730759
GRUBLOC=$GRUBLOC
760+
BOOTPART=$BOOTPART
761+
BOOTFSTYOE=$BOOTFSTYPE
731762
FOO
732763

733764
echo "==============================================================" >> /var/log/sparkylinux-installer.log
@@ -924,18 +955,12 @@ else
924955
echo "UUID=$UUIDHOMEPART /home $HFSTYPE $HFSTABOPT 0 2" >> /TARGET/etc/fstab
925956
fi
926957

927-
# add swap uuid to resume
928-
#if [ "$SWAP" != "NoSwap" ]; then
929-
# if [ ! -d /TARGET/etc/initramfs-tools/conf.d ]; then
930-
# mkdir -p /TARGET/etc/initramfs-tools/conf.d
931-
# fi
932-
# if [ -f /TARGET/etc/initramfs-tools/conf.d/resume ]; then
933-
# rm -f /TARGET/etc/initramfs-tools/conf.d/resume
934-
# fi
935-
#cat > /TARGET/etc/initramfs-tools/conf.d/resume <<FOO
936-
#RESUME=UUID=$UUIDSWAP
937-
#FOO
938-
#fi
958+
# add boot part
959+
if [ "$BOOTPART" != "NoBoot" ]; then
960+
UUIDBOOTPART=`blkid | grep $BOOTPART: | awk '{print $2}' | cut -f2 -d"=" | sed -e 's/"//g'`
961+
echo "# boot /dev/$BOOTPART" >> /TARGET/etc/fstab
962+
echo "UUID=$UUIDBOOTPART /boot ext4 defaults 0 2" >> /TARGET/etc/fstab
963+
fi
939964

940965
echo "UUIDs & FSTAB" >> /var/log/sparkylinux-installer.log
941966
echo "==============================================================" >> /var/log/sparkylinux-installer.log

‎8/CHANGELOG‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
-------------------------------------------------------------------------------
2+
Version 20240122.1~sparky8~0 (2024-01-22)
3+
-------------------------------------------------------------------------------
4+
* Small fix
5+
16
-------------------------------------------------------------------------------
27
Version 20240122~sparky8~0 (2024-01-22)
38
-------------------------------------------------------------------------------

‎8/bin/sparky-installer‎

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# sparky-installer has been forked
99
# for SparkyLinux by pavroo <[email protected]> 2013/08/04
1010
# Copyright 2013-2024 Under the GNU GPL2 License
11-
# Last update 2024/01/22 by pavroo
11+
# Last update 2024/01/22.1 by pavroo
1212

1313
# checking to make sure script is running with root privileges
1414
testroot="`whoami`"
@@ -71,16 +71,6 @@ fi
7171
# get default's locale file (english only)
7272
DEFLOCDIR="/usr/share/sparky/sparky-advanced-installer"
7373
. $DEFLOCDIR/en
74-
75-
### TODO
76-
#ask for testing dev installer
77-
#$DIALOG $TITLE"$TITLETEXT" $YESNO $TEXT"$LOCAL129\n\n$LOCAL130" $HEIGHT $WIDTH
78-
#if [ $? = 0 ]; then
79-
# echo "using the standard installer"
80-
#else
81-
# sparky-installer-dev
82-
# exit 0
83-
#fi
8474

8575
# the first dialog window
8676
if [ -f /lib/live/mount/medium/live/minimal ] || [ "$CHECKMINI" != "" ]; then
@@ -244,12 +234,7 @@ if [ "$TARGETPART" = "Exit" ]; then
244234
fi
245235

246236
#choose filesystem type to root partition
247-
# installation sparky on ext4 and btrfs on efi; on ext4 on bios only
248-
#if [ "$TARGETEFI" != "" ]; then
249-
$DIALOG $TITLE"$TITLETEXT" $MENU $TEXT"$LOCAL32" $HEIGHT $WIDTH $MENUHEIGHT btrfs "Btrfs $LOCAL33" ext3 "Ext3 $LOCAL33" ext4 "Ext4 $LOCAL33" xfs "Xfs $LOCAL33" 2>/tmp/choice.$$
250-
#else
251-
$DIALOG $TITLE"$TITLETEXT" $MENU $TEXT"$LOCAL32" $HEIGHT $WIDTH $MENUHEIGHT btrfs "Btrfs $LOCAL33" ext3 "Ext3 $LOCAL33" ext4 "Ext4 $LOCAL33" xfs "Xfs $LOCAL33" 2>/tmp/choice.$$
252-
#fi
237+
$DIALOG $TITLE"$TITLETEXT" $MENU $TEXT"$LOCAL32" $HEIGHT $WIDTH $MENUHEIGHT btrfs "Btrfs $LOCAL33" ext3 "Ext3 $LOCAL33" ext4 "Ext4 $LOCAL33" xfs "Xfs $LOCAL33" 2>/tmp/choice.$$
253238

254239
if [ "$?" = "0" ]; then
255240
FSTYPE=`cat /tmp/choice.$$`
@@ -260,7 +245,6 @@ fi
260245
rm /tmp/choice.$$
261246

262247
# choose home partition
263-
#HOMEINST=`echo $PARTINST | sed -r "s/$TARGETPART://"`
264248
if [ "$TARGETEFI" != "" ]; then
265249
HOMEINST=`blkid | grep -v "loop" | grep -v "sr0" | awk '{print $1}' | cut -f3 -d"/" | grep "[0-9]" | grep -v "$TARGETEFI" | grep -v "$SWAP" | grep -v "$TARGETPART" | cut -f1 -d":"`
266250
else
@@ -284,13 +268,8 @@ fi
284268
rm /tmp/choice.$$
285269

286270
# choose file system to home partition
287-
# installation sparky on ext4 and btrfs on efi; on ext4 on bios only
288271
if [ "$HOMEPART" != "root" ]; then
289-
#if [ "$TARGETEFI" != "" ]; then
290-
# $DIALOG $TITLE"$TITLETEXT" $MENU $TEXT"$LOCAL37" $HEIGHT $WIDTH $MENUHEIGHT noformat "$LOCAL38" btrfs "Btrfs $LOCAL33" ext3 "Ext3 $LOCAL33" ext4 "Ext4 $LOCAL33" xfs "Xfs $LOCAL33" 2>/tmp/choice.$$
291-
#else
292-
$DIALOG $TITLE"$TITLETEXT" $MENU $TEXT"$LOCAL37" $HEIGHT $WIDTH $MENUHEIGHT noformat "$LOCAL38" btrfs "Btrfs $LOCAL33" ext3 "Ext3 $LOCAL33" ext4 "Ext4 $LOCAL33" xfs "Xfs $LOCAL33" 2>/tmp/choice.$$
293-
#fi
272+
$DIALOG $TITLE"$TITLETEXT" $MENU $TEXT"$LOCAL37" $HEIGHT $WIDTH $MENUHEIGHT noformat "$LOCAL38" btrfs "Btrfs $LOCAL33" ext3 "Ext3 $LOCAL33" ext4 "Ext4 $LOCAL33" xfs "Xfs $LOCAL33" 2>/tmp/choice.$$
294273

295274
if [ "$?" = "0" ]; then
296275
HFSTYPE=`cat /tmp/choice.$$`
@@ -304,7 +283,7 @@ fi
304283

305284
# choose boot partition
306285
if [ "$TARGETEFI" != "" ]; then
307-
BOOTINST=`blkid | grep -v "loop" | grep -v "sr0" | awk '{print $1}' | cut -f3 -d"/" | grep "[0-9]" | grep -v "$TARGETEFI" | grep -v "$SWAP" | grep -v "$TARGETPART" | grep-v "$HOMEPART" | cut -f1 -d":"`
286+
BOOTINST=`blkid | grep -v "loop" | grep -v "sr0" | awk '{print $1}' | cut -f3 -d"/" | grep "[0-9]" | grep -v "$TARGETEFI" | grep -v "$SWAP" | grep -v "$TARGETPART" | grep -v "$HOMEPART" | cut -f1 -d":"`
308287
else
309288
BOOTINST=`blkid | grep -v "loop" | grep -v "sr0" | awk '{print $1}' | cut -f3 -d"/" | grep "[0-9]" | grep -v "$SWAP" | grep -v "$TARGETPART" | grep -v "$HOMEPART" | cut -f1 -d":"`
310289
fi

0 commit comments

Comments
 (0)