diff --git a/jobo-setup/66-user-down b/jobo-setup/66-user-down new file mode 100755 index 0000000..dcfb730 --- /dev/null +++ b/jobo-setup/66-user-down @@ -0,0 +1,10 @@ +#!/usr/bin/sh +echo "disable and stop user level supervision with s6" +sudo 66-all -v2 -t boot-user down +uname=$(id -nu 1000) +echo "enter your username or $uname will be used" +read uname +: "${uname:=$(id -nu 1000)}" +sudo -u $uname 66-all -v2 -t base down +sudo -u $uname 66-intree -zg +sudo 66-intree -zg boot-user diff --git a/jobo-setup/66-user-up b/jobo-setup/66-user-up new file mode 100755 index 0000000..daebebb --- /dev/null +++ b/jobo-setup/66-user-up @@ -0,0 +1,11 @@ +#!/usr/bin/sh +echo "enable and start user level supervision with s6" +sudo 66-all -v2 -t boot-user up +uname=$(id -nu 1000) +: "${uname:=$(id -nu 1000)}" +echo "enter your username or $uname will be used" +read uname +: "${uname:=$(id -nu 1000)}" +sudo -u $uname 66-all -v2 -t base up +sudo 66-intree -zg boot-user +sudo -u $uname 66-intree -zg base diff --git a/jobo-setup/66.setup b/jobo-setup/66.setup index 0a23bc4..e32ad22 100755 --- a/jobo-setup/66.setup +++ b/jobo-setup/66.setup @@ -1,17 +1,26 @@ #!/bin/sh +echo "enter the name of the user you may want to enable services for" +echo "$(id -un 1000) will be used if you do not enter a username" +read uname +uname=$(id -nu 1000) +: "${uname:=$(id -nu 1000)}" sudo 66-tree -R net sudo 66-tree -R root sudo 66-tree -R boot sudo 66-tree -R boot-user +sudo -u $uname -R base sudo 66-tree -n boot sudo 66-tree -nE net sudo 66-tree -ncE -S net root sudo 66-tree -n boot-user sudo 66-enable -t boot -F boot@sys -sudo 66-enable -t net -FS dhclient@eth0 -sudo 66-enable -t root -FS ntpd -sudo 66-enable -t boot-user -F scandir@make mount-run@make setenv@make dbus consolekit -sudo -u make 66-tree -nE base -sudo -u make 66-enable -t base -FS dbus-session@make xdg-user-dirs +sudo 66-enable -t net -F dhclient@eth0 +sudo 66-enable -t root -F ntpd +sudo 66-enable -t boot-user -F dbus consolekit scandir@$uname mount-run@$uname setenv@$uname console-tracker@consolekit +sudo -u $uname 66-tree -nE base +sudo -u $uname 66-enable -t base -F dbus-session@$uname xdg-user-dirs sudo 66-intree -zg -sudo -u make 66-intree -zg +sudo -u $uname 66-intree -zg +echo "use 66-user-up and 66-user-down to enable/start or disable/stop user level s6 supervision" +echo "other trees than (boot root net boot-user) and user's (base) will not be altered or affected by this procedure" +echo "we are simply trying to offer a common s6 and 66 setup to be used as a base for further experimentation and custom work" diff --git a/jobo-setup/PKGBUILD b/jobo-setup/PKGBUILD index 0991b83..784a4ce 100644 --- a/jobo-setup/PKGBUILD +++ b/jobo-setup/PKGBUILD @@ -7,11 +7,13 @@ pkgname=jobo-setup pkgdesc='Post Install joborun setup script - The script will not alter your system, you will!' -pkgver=0.4 -pkgrel=02 +pkgver=0.5 +pkgrel=01 groups=(base) source=( 'README.txt' '66.setup' + '66-user-up' + '66-user-down' 'add.66' 'installX' 'joborun-setup' @@ -27,6 +29,8 @@ package() { install -Dm644 $srcdir/README.txt "$pkgdir/root/README.txt" install -Dm755 $srcdir/joborun-setup "$pkgdir/usr/local/bin/" install -Dm755 $srcdir/66.setup "$pkgdir/usr/local/bin/" + install -Dm755 $srcdir/66-user-up "$pkgdir/usr/local/bin/" + install -Dm755 $srcdir/66-user-down "$pkgdir/usr/local/bin/" install -Dm755 $srcdir/add.66 "$pkgdir/usr/local/bin/" install -Dm755 $srcdir/installX "$pkgdir/usr/local/bin/" install -Dm755 $srcdir/removeX "$pkgdir/usr/local/bin/" @@ -41,7 +45,9 @@ arch=(x86_64) license=(ISC) sha256sums=(5c57b7e372ce103afa24acfd4479a85c80c6980e06d580d5bee6c6b3f24174ab # README.txt - 16df745a9ee5a28190347741fbb333e8e37e4cab89c33bc48c2dd7dd16aaab92 # 66.setup + d6a93376647d16e04e2e8e3a7d7f6379a3727c5a695fac15e40813eaf627aa4a # 66.setup + 53a968efacc805e2b8ea7e7d717f67909fba975e587612bc4accd83cba8edf32 # 66-user-up + d8abf5f581779d53eb2f81dd9f5f68596867eddbf76edcf79c6de5873abbac86 # 66-user-down 18ef4f0e1cbb60f90a6aa6456f24aec7eea990f6f3f220288303d4dc4b95dc93 # add.66 6da18c734fdcd67386e1ef6be59423a3ed59631c5541b23cf78050a5891421a8 # installX 33de4e4329d0e4c8f2a278e2bd726db5ee5fff59e943fb07004278d4a0d1d20a # joborun-setup @@ -49,5 +55,4 @@ sha256sums=(5c57b7e372ce103afa24acfd4479a85c80c6980e06d580d5bee6c6b3f24174ab # e078695327e40790c675d04ed9d8144840ee64a90b8d9d782a7d843109eb9d52 # rm.66 3bc8aa0ad93233ef9c191c3a2d37ae9f1592a48add8a23b55afac1d7f4397762) # X.list -## 665ab17764011a5aeed063cf6fbc53d10fd2b57f7ac79a819d8e33b03f08fecd jobo-setup-0.4-02-x86_64.pkg.tar.lz - +## 278d6a2f13bdc4ec1b11999b737101275758f6695e9513b0f2f230a29db9a09b jobo-setup-0.5-01-x86_64.pkg.tar.lz diff --git a/jobo66/PKGBUILD b/jobo66/PKGBUILD index 6081c50..e319ea0 100644 --- a/jobo66/PKGBUILD +++ b/jobo66/PKGBUILD @@ -6,9 +6,9 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=jobo66 -pkgdesc="installs minimal s6 & 66 needed software equivalent to the runit setup on joborun to boot w/ s6/66" -pkgver=0.1.0 -pkgrel=07 +pkgdesc="installs minimal s6 & 66 needed software equivalent to the runit setup on joborun to boot w/ s6/66 and provide user level service supervision" +pkgver=0.1.1 +pkgrel=01 source=(jobo66.txt jobo66.install) makedepends=(glibc sh) groups=('s6-suite' 'jobo66') @@ -23,7 +23,8 @@ package() { depends=(skalibs execline s6 s6-dns s6-linux-utils s6-networking s6-portable-utils s6-rc oblibs 66 66-tools boot-66serv boot@-66serv ntpd-66serv dhclient-66serv wpa_supplicant-66serv tty@-66serv joborun66 obsysusers opentmpfiles - boot-user@-66serv dbus-66serv xdg-user-dirs-66serv consolekit-66serv ) + boot-user@-66serv dbus-66serv xdg-user-dirs-66serv consolekit-66serv + console-tracker@-66serv consolekit2 ) install -Dm 0644 $srcdir/jobo66.txt $pkgdir/etc/66/jobo66.txt mkdir -p $pkgdir/usr/bin @@ -46,5 +47,4 @@ license=('ISC') sha256sums=(39c75848713bb50f782844bb790dc2ec76b104fe15c2e272ee622a559319220e # jobo66.txt d109d7d2b3bfa6959142906e6e5a3c7df4d9d1d71e7a6853a5c113dc6169ccad) # jobo66.install -## 16bdfcae4f5a3ffe4ce06249f790d1c2dd3fd366f5e07ffc138111a6d9623574 jobo66-0.1.0-07-x86_64.pkg.tar.lz - +## 85680dcf9001949ecd802aff3309370c8985113536a93db492705c2cbb7eef06 jobo66-0.1.1-01-x86_64.pkg.tar.lz