modified: ts/bin/bt

modified: ts/build/conf/devstation/build.conf.example modified: ts/build/conf/devstation/thinstation.conf.buildtime modified: ts/build/conf/installer/build.conf.example modified: ts/build/conf/installer/thinstation.conf.buildtime modified: ts/build/packages/base/etc/init.d/fastboot modified: ts/build/packages/base/etc/init.d/mounts modified: ts/build/packages/devstation/bin/devcmd modified: ts/build/packages/devstation/lib/menu/1build
Thinstation · Dec 11, 2020 · 4087d3d · 4087d3d
1 parent e71c76c
commit 4087d3d
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 18 deletions.
diff --git a/ts/bin/bt b/ts/bin/bt
@@ -19,7 +19,7 @@ confirm_iso()
 confirm_hd()
 {
 	if [ ! -e $HD ]; then
-		qemu-img create -f qcow2 $HD 31G
+		qemu-img create -f raw $HD 31G
 	        if [ "$?" != "0" ]; then
 			echo "Likely not enought space to create hd image."
 			exit 3
@@ -85,7 +85,7 @@ setup_qemu()
 #	VGA="-vga vmware"
 	SOUND="-device AC97"
 	CPU="-smp cores=$procs,threads=1,sockets=1"
-	MEMORY="-m 4096"
+	MEMORY="-m 2048"
 #	RNG="-object rng-random,id=RNG"
 	MOUSE="-usb -device usb-tablet"
 	KVM="-enable-kvm"

diff --git a/ts/build/conf/devstation/build.conf.example b/ts/build/conf/devstation/build.conf.example
@@ -373,6 +373,7 @@ param haltonerror    false				# Will halt on error, default is true
 param hardlinkfs     true
 param sametimestmp   true                               # When enabled, the timestamps for all files and folders will be set to 00:00 of todays date in your timezone
 param initrdcmd	     "gzip"				# Compression mode and level of initrd file. none, gzip -9, lzma -9 ,bzip2 -9
+param squashopt      "-comp xz -Xdict-size max"
 param bootverbosity   3          			# Increased vebosity when booting TS
                                 			#   0 no verbose messages
                                 			#   1 boot

diff --git a/ts/build/conf/devstation/thinstation.conf.buildtime b/ts/build/conf/devstation/thinstation.conf.buildtime
@@ -4,7 +4,7 @@ HD_MOUNT=true
 #X_DPI=100
 #USE_XRANDR=TRUE
 #XRANDR_OPTIONS="-s 1680x1050"
-#MEMORY_CONSTRAINED="TRUE"
+MEMORY_CONSTRAINED="TRUE"
 SESSION_0_TYPE=xfwm4
 SESSION_1_TYPE=chrome
 SESSION_0_AUTOSTART=on

diff --git a/ts/build/conf/installer/build.conf.example b/ts/build/conf/installer/build.conf.example
@@ -354,6 +354,7 @@ param haltonerror    false				# Will halt on error, default is true
 param hardlinkfs     true
 param sametimestmp   true                               # When enabled, the timestamps for all files and folders will be set to 00:00 of todays date in your timezone
 param initrdcmd	     "gzip"				# Compression mode and level of initrd file. none, gzip -9, lzma -9 ,bzip2 -9
+param squashopt      "-comp xz -Xdict-size max"
 param bootverbosity   3          			# Increased vebosity when booting TS
                                 			#   0 no verbose messages
                                 			#   1 boot

diff --git a/ts/build/conf/installer/thinstation.conf.buildtime b/ts/build/conf/installer/thinstation.conf.buildtime
@@ -78,6 +78,7 @@ NET_REMOTE_ACCESS_FROM="0.0.0.0"
 #WIRELESS_DRIVER="wext"
 #TFTP_BLOCKSIZE=8192
 TFTP_BLOCKSIZE=1024
+MOUNT_0="LABEL=THINSTATION     /boot           auto    x-mount.mkdir,defaults  0       0"
 BIND_MOUNT0="home:/tmp-home"
 BIND_MOUNT1="boot:/boot"
 BIND_MOUNT2="tsdev:/thinstation"

diff --git a/ts/build/packages/base/etc/init.d/fastboot b/ts/build/packages/base/etc/init.d/fastboot
@@ -206,6 +206,7 @@ mount_squash()
 		else
 			if [ ! -e /tmp/lib.squash ] ; then
 				cp $FILE /tmp/lib.squash
+				systemctl start --no-block vmtouch.service
 			fi
 			systemd-mount --fsck=no -o ro,loop -t squashfs /tmp/lib.squash /lib
 			systemctl start --no-block vmtouch.service

diff --git a/ts/build/packages/base/etc/init.d/mounts b/ts/build/packages/base/etc/init.d/mounts
@@ -15,11 +15,11 @@ done
 
 # Swap initialization
 if grep /etc/fstab -e swap -q; then
-	if is_enabled $MEMORY_CONSTRAINED ; then
-		echo 100 > /proc/sys/vm/swappiness
-	else
-		echo 0 > /proc/sys/vm/swappiness
-	fi
+#	if is_enabled $MEMORY_CONSTRAINED ; then
+#		echo 100 > /proc/sys/vm/swappiness
+#	else
+#		echo 0 > /proc/sys/vm/swappiness
+#	fi
 	swapon -a
 fi
 

diff --git a/ts/build/packages/devstation/bin/devcmd b/ts/build/packages/devstation/bin/devcmd
@@ -125,17 +125,17 @@ do_test_cd()
         $XTERM_CMD -T Test-CD --working-directory=/thinstation $ARG script -c "./setup-chroot -e bt cd" -e /home/$TSUSER/Desktop/test.log
 }
 
-do_test_cd_refind_efi()
+do_test_cd_efi()
 {
-        $XTERM_CMD -T Test-CD-EFI --working-directory=/thinstation $ARG script -c "./setup-chroot -e bt cd-efi" -e /home/$TSUSER/Desktop/test.log
+        $XTERM_CMD -T Test-CD-EFI --working-directory=/thinstation $ARG script -c "./setup-chroot -e bt cd-refind" -e /home/$TSUSER/Desktop/test.log
 }
 do_test_hd()
 {
         $XTERM_CMD -T Test-HD --working-directory=/thinstation $ARG script -c "./setup-chroot -e bt hd" -e /home/$TSUSER/Desktop/test.log
 }
-do_test_hd_systmed_efi()
+do_test_hd_efi()
 {
-        $XTERM_CMD -T Test-HD-EFI --working-directory=/thinstation $ARG script -c "./setup-chroot -e bt hd-efi" -e /home/$TSUSER/Desktop/test.log
+        $XTERM_CMD -T Test-HD-EFI --working-directory=/thinstation $ARG script -c "./setup-chroot -e bt hd-refind" -e /home/$TSUSER/Desktop/test.log
 }
 do_test_net()
 {
@@ -191,11 +191,8 @@ case $1 in
 	test-hd)
                 do_test_hd
 		;;
-	test-hd-systemd-efi)
-                do_test_hd_systemd_efi
-		;;
-	test-hd-refind-efi)
-                do_test_hd_refind_efi
+	test-hd-efi)
+                do_test_hd_efi
 		;;
 	test-net)
                 do_test_net

diff --git a/ts/build/packages/devstation/lib/menu/1build b/ts/build/packages/devstation/lib/menu/1build
@@ -3,7 +3,7 @@ package="devstation"; icon="media-optical"; needs="x11"; title="CD"; command="su
 package="devstation"; icon="media-optical"; needs="x11"; title="CD-EFI"; command="sudo devcmd test-cd-efi"; menu="DevStation::Test-Build"; nodesktop="true"
 package="devstation"; icon="media-flash"; needs="x11"; title="HD"; command="sudo devcmd test-hd"; menu="DevStation::Test-Build"; nodesktop="true"
 package="devstation"; icon="media-flash"; needs="x11"; title="HD-EFI"; command="sudo devcmd test-hd-efi"; menu="DevStation::Test-Build"; nodesktop="true"
-package="devstation"; icon="network-wired"; needs="x11"; title="NET"; command="sudo devcmd test-pxe"; menu="DevStation::Test-Build"; nodesktop="true"
+package="devstation"; icon="network-wired"; needs="x11"; title="NET"; command="sudo devcmd test-net"; menu="DevStation::Test-Build"; nodesktop="true"
 package="devstation"; icon="DevStation"; needs="x11"; title="Edit Configs"; command="sudo devcmd configure"; menu="DevStation"; nodesktop="true"
 package="devstation"; icon="DevStation"; needs="x11"; title="Toggle All Modules"; command="sudo devcmd toggle-modules"; menu="DevStation"; nodesktop="true"
 package="devstation"; icon="DevStation"; needs="x11"; title="Toggle Console"; command="sudo devcmd toggle-con"; menu="DevStation"; nodesktop="true"