From 086c28da5b754d16eef69ae5a856bd25a52a68b7 Mon Sep 17 00:00:00 2001 From: probonopd Date: Sun, 7 Nov 2021 10:08:54 +0100 Subject: [PATCH 1/7] Add initgfx_message --- .cirrus.yml | 2 +- .../initgfx/files/etc/rc.d/initgfx_message | 63 +++++++++++++++++++ 2 files changed, 64 insertions(+), 1 deletion(-) create mode 100755 overlays/uzip/initgfx/files/etc/rc.d/initgfx_message diff --git a/.cirrus.yml b/.cirrus.yml index 9d2b0293..20565af4 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -5,7 +5,7 @@ task: matrix: # image: freebsd-12-1-release-amd64 # EOL - image: freebsd-12-2-release-amd64 - - image: freebsd-13-0-release-amd64 # ISO way too large, HIDPI broken? + # image: freebsd-13-0-release-amd64 # ISO way too large, HIDPI broken, BIOS boot broken, boot installed system broken? env: CIRRUS_CLONE_DEPTH: 1 diff --git a/overlays/uzip/initgfx/files/etc/rc.d/initgfx_message b/overlays/uzip/initgfx/files/etc/rc.d/initgfx_message new file mode 100755 index 00000000..e528fccc --- /dev/null +++ b/overlays/uzip/initgfx/files/etc/rc.d/initgfx_message @@ -0,0 +1,63 @@ +#!/bin/sh +# +# Copyright (c) 2021, Simon Peter +# +# PROVIDE: initgfx +# REQUIRE: LOGIN +# BEFORE: slim + +. /etc/rc.subr + +name=initgfx_message +start_cmd="do_initgfx_message" + +rcvar=initgfx_enable + +load_rc_config ${name} + +: ${initgfx_enable:="YES"} + +initgfx_warn() +{ + echo "${name}:" $* >&2 +} + +initgfx_debug() +{ + echo "${name}:" $* >&2 +} + +do_initgfx_message() +{ +# Wait for one minute after running initfgx +sleep 60 + +# Exit if Xorg is running +pgrep -f Xorg && exit 0 + +# If we don't have Xorg running by then, output a message and offer to log into the machine + +cat > /dev/console < Date: Sun, 7 Nov 2021 10:16:41 +0100 Subject: [PATCH 2/7] Add initgfx_message --- overlays/uzip/initgfx/files/etc/rc.d/initgfx_message | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/overlays/uzip/initgfx/files/etc/rc.d/initgfx_message b/overlays/uzip/initgfx/files/etc/rc.d/initgfx_message index e528fccc..5fe254f6 100755 --- a/overlays/uzip/initgfx/files/etc/rc.d/initgfx_message +++ b/overlays/uzip/initgfx/files/etc/rc.d/initgfx_message @@ -2,9 +2,9 @@ # # Copyright (c) 2021, Simon Peter # -# PROVIDE: initgfx +# PROVIDE: initgfx_message # REQUIRE: LOGIN -# BEFORE: slim +# BEFORE: initgfx . /etc/rc.subr From c9bb6218d6566f069ee93967c5238ed5c439a2ab Mon Sep 17 00:00:00 2001 From: probonopd Date: Sun, 7 Nov 2021 10:26:03 +0100 Subject: [PATCH 3/7] Add Nvidia driver version 390 for Nvidia Quadro 2000 https://github.com/helloSystem/hello/discussions/241#discussioncomment-1599131 --- build.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 388d3a1c..23e6eee7 100755 --- a/build.sh +++ b/build.sh @@ -335,8 +335,10 @@ initgfx() else PKGS="latest" fi + + # 390 needed for Nvidia Quadro 2000, https://github.com/helloSystem/hello/discussions/241#discussioncomment-1599131 + for ver in '390'; do # Only use NVIDIA version 440 and 390 for now to reduce ISO image size # for ver in '' 390 340 304; do - for ver in ''; do # Only use NVIDIA version 440 for now to reduce ISO image size pkgfile=$(/usr/local/sbin/pkg-static -c ${uzip} rquery %n-%v.txz nvidia-driver${ver:+-$ver}) fetch -o "${cache}/" "https://pkg.freebsd.org/FreeBSD:${MAJOR}:amd64/${PKGS}/All/${pkgfile}" mkdir -p "${uzip}/usr/local/nvidia/${ver:-440}/" From 0235fee240ae428eae71c67db5cea7b52506e57d Mon Sep 17 00:00:00 2001 From: probonopd Date: Mon, 8 Nov 2021 00:15:02 +0100 Subject: [PATCH 4/7] Run localize earlier [ci skip] --- overlays/uzip/localize/files/usr/local/etc/rc.d/localize | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/overlays/uzip/localize/files/usr/local/etc/rc.d/localize b/overlays/uzip/localize/files/usr/local/etc/rc.d/localize index 453b9281..82163131 100755 --- a/overlays/uzip/localize/files/usr/local/etc/rc.d/localize +++ b/overlays/uzip/localize/files/usr/local/etc/rc.d/localize @@ -1,8 +1,8 @@ #!/bin/sh # PROVIDE: localize -# REQUIRE: DAEMON NETWORKING -# BEFORE: LOGIN +# REQUIRE: ldconfig +# BEFORE: hostid # KEYWORD: nojail shutdown PATH=$PATH:/usr/local/sbin From cbee860fdaae9209753af7f5d1087f8bd911bcac Mon Sep 17 00:00:00 2001 From: probonopd Date: Mon, 8 Nov 2021 01:32:52 +0100 Subject: [PATCH 5/7] Make Chromium use System Title Bar and Borders https://github.com/helloSystem/hello/issues/45 --- .../usr/share/skel/dot.config/chromium/Default/Preferences | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/overlays/uzip/hello/files/usr/share/skel/dot.config/chromium/Default/Preferences b/overlays/uzip/hello/files/usr/share/skel/dot.config/chromium/Default/Preferences index 2da410d4..327b7622 100644 --- a/overlays/uzip/hello/files/usr/share/skel/dot.config/chromium/Default/Preferences +++ b/overlays/uzip/hello/files/usr/share/skel/dot.config/chromium/Default/Preferences @@ -1 +1,6 @@ -{"custom_chrome_frame":true} +{ + "browser":{ + "custom_chrome_frame":false, + "has_seen_welcome_page":true + } +} From 98d7990a3822c209873fbc2be0ffbae23c0804cf Mon Sep 17 00:00:00 2001 From: probonopd Date: Tue, 9 Nov 2021 08:04:31 +0100 Subject: [PATCH 6/7] Make message more readable [ci skip] --- .../initgfx/files/etc/rc.d/initgfx_message | 35 ++++++++++++------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/overlays/uzip/initgfx/files/etc/rc.d/initgfx_message b/overlays/uzip/initgfx/files/etc/rc.d/initgfx_message index 5fe254f6..a50f5dd3 100755 --- a/overlays/uzip/initgfx/files/etc/rc.d/initgfx_message +++ b/overlays/uzip/initgfx/files/etc/rc.d/initgfx_message @@ -36,27 +36,36 @@ sleep 60 pgrep -f Xorg && exit 0 # If we don't have Xorg running by then, output a message and offer to log into the machine - +clear cat > /dev/console < Date: Tue, 9 Nov 2021 19:02:49 +0100 Subject: [PATCH 7/7] sysutils/py-psutil [ci skip] Do not hardcode python version --- overlays/uzip/hello/files/usr/local/bin/desktop2app | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overlays/uzip/hello/files/usr/local/bin/desktop2app b/overlays/uzip/hello/files/usr/local/bin/desktop2app index 7d328d2d..b2f40249 100755 --- a/overlays/uzip/hello/files/usr/local/bin/desktop2app +++ b/overlays/uzip/hello/files/usr/local/bin/desktop2app @@ -271,7 +271,7 @@ if __name__ == "__main__": try: import psutil except: - print("Cannot watch the system for newly installed applications since py37-psutil is missing.") + print("Cannot watch the system for newly installed applications since sysutils/py-psutil is missing.") exit(1) signal.signal(signal.SIGINT, QtCore.QCoreApplication.quit) # FIXME: Make Ctrl-C work; Does not seem to work