prepare for new base package

.gitignore

@@ -0,0 +1 @@
+to_package/

base/Packages-Live

@@ -1,18 +0,0 @@
-mkinitcpio-nfs-utils
-squashfs-tools
-nbd
-
-@openrc artix-live-openrc
-@runit artix-live-runit
-artix-live-portable-efi
-
-@openrc networkmanager-openrc
-@openrc ntp-openrc
-@openrc bluez-openrc
-
-@runit networkmanager-runit
-@runit ntp-runit
-@runit bluez-runit
-
-intel-ucode
-amd-ucode

base/Packages-Root

@@ -1,3 +1,7 @@
+base
+@openrc openrc
+@runit runit
+@s6 s6
 acpi
 b43-fwcutter
 bash
@@ -49,6 +53,7 @@ ntfs-3g
 @openrc cronie-openrc
 @openrc cryptsetup-openrc
 @openrc dhcpcd-openrc
+@openrc elogind-openrc
 @openrc haveged-openrc
 @openrc lvm2-openrc
 @openrc mdadm-openrc
@@ -61,6 +66,7 @@ ntfs-3g
 @runit cronie-runit
 @runit cryptsetup-runit
 @runit dhcpcd-runit
+@runit elogind-runit
 @runit haveged-runit
 @runit lvm2-runit
 @runit mdadm-runit
@@ -69,7 +75,9 @@ ntfs-3g
 @runit openssh-runit
 @runit wpa_supplicant-runit
 @runit syslog-ng-runit
-artix-sysvcompat
+@s6 dhcpcd-s6
+@s6 elogind-s6
+@s6 syslog-ng-s6
 os-prober
 pacman
 pciutils
@@ -90,3 +98,24 @@ which
 efibootmgr
 xfsprogs
 zsh
+
+mkinitcpio-nfs-utils
+squashfs-tools
+nbd
+
+@openrc artix-live-openrc
+@runit artix-live-runit
+artix-live-portable-efi
+
+#@openrc networkmanager-openrc
+@openrc connman-openrc
+@openrc ntp-openrc
+@openrc bluez-openrc
+
+#@runit networkmanager-runit
+@runit connman-runit
+@runit ntp-runit
+@runit bluez-runit
+
+intel-ucode
+amd-ucode

base/profile.conf

@@ -8,7 +8,7 @@
 AUTOLOGIN="false"
 
 # start services
-# SERVICES=('acpid' 'bluetooth' 'cronie' 'cupsd' 'syslog-ng' 'NetworkManager')
+SERVICES=('acpid' 'bluetooth' 'cronie' 'cupsd' 'syslog-ng' 'connman')
 
 # default group membership
 # ADDGROUPS="video,power,storage,optical,network,lp,scanner,wheel,users,log"

linexa/Packages-Root

@@ -1,5 +1,8 @@
 ### packages added here will be installed on the target system
-
+base
+@openrc openrc
+@runit runit
+@s6 s6
 acpi
 b43-fwcutter
 bash
@@ -51,6 +54,7 @@ ntfs-3g
 @openrc cronie-openrc
 @openrc cryptsetup-openrc
 @openrc dhcpcd-openrc
+@openrc elogind-openrc
 @openrc haveged-openrc
 @openrc lvm2-openrc
 @openrc mdadm-openrc
@@ -63,6 +67,7 @@ ntfs-3g
 @runit cronie-runit
 @runit cryptsetup-runit
 @runit dhcpcd-runit
+@runit elogind-runit
 @runit haveged-runit
 @runit lvm2-runit
 @runit mdadm-runit
@@ -71,7 +76,9 @@ ntfs-3g
 @runit openssh-runit
 @runit wpa_supplicant-runit
 @runit syslog-ng-runit
-artix-sysvcompat
+@s6 dhcpcd-s6
+@s6 elogind-s6
+@s6 syslog-ng-s6
 os-prober
 pacman
 pciutils

linexa/live-overlay/etc/default

@@ -0,0 +1 @@
+../../../base/root-overlay/etc/default

linexa/live-overlay/etc/default/grub

@@ -1,49 +0,0 @@
-GRUB_DEFAULT=saved
-GRUB_TIMEOUT=5
-GRUB_DISTRIBUTOR="Artix"
-GRUB_CMDLINE_LINUX_DEFAULT="quiet splash"
-GRUB_CMDLINE_LINUX=""
-
-# If you want to enable the save default function, uncomment the following
-# line, and set GRUB_DEFAULT to saved.
-GRUB_SAVEDEFAULT=true
-
-# Preload both GPT and MBR modules so that they are not missed
-GRUB_PRELOAD_MODULES="part_gpt part_msdos"
-
-# Uncomment to enable Hidden Menu, and optionally hide the timeout count
-#GRUB_HIDDEN_TIMEOUT=5
-#GRUB_HIDDEN_TIMEOUT_QUIET=true
-
-# Uncomment to use basic console
-GRUB_TERMINAL_INPUT=console
-
-# Uncomment to disable graphical terminal
-#GRUB_TERMINAL_OUTPUT=console
-
-# The resolution used on graphical terminal
-# note that you can use only modes which your graphic card supports via VBE
-# you can see them in real GRUB with the command `vbeinfo'
-GRUB_GFXMODE=auto
-
-# Uncomment to allow the kernel use the same resolution used by grub
-GRUB_GFXPAYLOAD_LINUX=keep
-
-# Uncomment if you want GRUB to pass to the Linux kernel the old parameter
-# format "root=/dev/xxx" instead of "root=/dev/disk/by-uuid/xxx"
-#GRUB_DISABLE_LINUX_UUID=true
-
-# Uncomment to disable generation of recovery mode menu entries
-GRUB_DISABLE_RECOVERY=true
-
-# Uncomment and set to the desired menu colors.  Used by normal and wallpaper
-# modes only.  Entries specified as foreground/background.
-GRUB_COLOR_NORMAL="light-gray/black"
-GRUB_COLOR_HIGHLIGHT="cyan/black"
-
-# Uncomment one of them for the gfx desired, a image background or a gfxtheme
-GRUB_BACKGROUND="/usr/share/grub/background.png"
-#GRUB_THEME="/path/to/gfxtheme"
-
-# Uncomment to get a beep at GRUB start
-#GRUB_INIT_TUNE="480 440 1"

linexa/live-overlay/etc/fstab

@@ -1,5 +0,0 @@
-#
-# /etc/fstab: static file system information
-#
-# <file system>        <dir>         <type>    <options>          <dump> <pass>
-/dev/mapper/rootfs /             auto      defaults           0      0

linexa/live-overlay/etc/fstab

@@ -0,0 +1 @@
+../../../base/root-overlay/etc/fstab

linexa/live-overlay/etc/issue

@@ -1,13 +0,0 @@
-
-Artix Live ISO (\l) - \s-\r \m
-
-
-
-# Welcome to Artix #
-
-
-login for the live environment:
-    user     'artix'
-    password 'artix'
-
-

linexa/live-overlay/etc/issue

@@ -0,0 +1 @@
+../../../base/root-overlay/etc/issue

linexa/live-overlay/etc/pam.d

@@ -0,0 +1 @@
+../../../base/root-overlay/etc/pam.d

linexa/live-overlay/etc/pam.d/su

@@ -1,6 +0,0 @@
-#%PAM-1.0
-auth		sufficient	pam_rootok.so
-auth		sufficient	pam_wheel.so trust use_uid
-auth		required	pam_unix.so
-account		required	pam_unix.so
-session		required	pam_unix.so

linexa/live-overlay/etc/polkit-1

@@ -0,0 +1 @@
+../../../base/root-overlay/etc/polkit-1

linexa/live-overlay/etc/polkit-1/rules.d/90-live.rules

@@ -1,8 +0,0 @@
-/* Allow members of the wheel group to execute any actions
- * without password authentication, similar to "sudo NOPASSWD:"
- */
-polkit.addRule(function(action, subject) {
-    if (subject.isInGroup("wheel")) {
-        return polkit.Result.YES;
-    }
-});

linexa/live-overlay/etc/sudoers.d

@@ -0,0 +1 @@
+../../../base/root-overlay/etc/sudoers.d

linexa/live-overlay/etc/sudoers.d/g_wheel

@@ -1 +0,0 @@
-%wheel  ALL=(ALL) NOPASSWD: ALL

linexa/live-overlay/etc/sudoers.d/u_root

@@ -1 +0,0 @@
-root ALL=(ALL) ALL

lxqt/Packages-Root

@@ -1,3 +1,7 @@
+base
+@openrc openrc
+@runit runit
+@s6 s6
 acpi
 b43-fwcutter
 bash
@@ -49,6 +53,7 @@ ntfs-3g
 @openrc cronie-openrc
 @openrc cryptsetup-openrc
 @openrc dhcpcd-openrc
+@openrc elogind-openrc
 @openrc haveged-openrc
 @openrc lvm2-openrc
 @openrc mdadm-openrc
@@ -61,6 +66,7 @@ ntfs-3g
 @runit cronie-runit
 @runit cryptsetup-runit
 @runit dhcpcd-runit
+@runit elogind-runit
 @runit haveged-runit
 @runit lvm2-runit
 @runit mdadm-runit
@@ -69,7 +75,9 @@ ntfs-3g
 @runit openssh-runit
 @runit wpa_supplicant-runit
 @runit syslog-ng-runit
-artix-sysvcompat
+@s6 dhcpcd-s6
+@s6 elogind-s6
+@s6 syslog-ng-s6
 os-prober
 pacman
 pciutils

lxqt/live-overlay

@@ -0,0 +1 @@
+../base/root-overlay

lxqt/live-overlay/etc/default

@@ -1 +0,0 @@
-../../../base/live-overlay/etc/default

lxqt/live-overlay/etc/fstab

@@ -1 +0,0 @@
-../../../base/live-overlay/etc/fstab

lxqt/live-overlay/etc/issue

@@ -1 +0,0 @@
-../../../base/live-overlay/etc/issue

lxqt/live-overlay/etc/pam.d

@@ -1 +0,0 @@
-../../../base/live-overlay/etc/pam.d

lxqt/live-overlay/etc/polkit-1

@@ -1 +0,0 @@
-../../../base/live-overlay/etc/polkit-1

lxqt/live-overlay/etc/skel/.config/konversationrc

@@ -1,131 +0,0 @@
-[Aliases]
-AliasList=cmd /exec cmd,sysinfo /exec sysinfo,tinyurl /exec tinyurl,uptime /exec uptime,media /exec media,audio /exec media audio,video /exec media video,gauge /exec gauge,mail /exec mail,fortune /exec fortune,bug /exec bug,sayclip /exec sayclip
-
-[Appearance]
-ChannelSplitterSizes=376,156
-TopicSplitterSizes=28,585
-TreeSplitterSizes=145,756
-
-[Autoreplace List]
-Direction0=o
-Direction1=o
-Pattern0=\\[\\[([^\\s]+)\\]\\]#
-Pattern1=(BUG:|bug:)([0-9]+)#
-Regex0=1
-Regex1=1
-Replace0=http://en.wikipedia.org/wiki/Special:Search?go=Go&search=%1#
-Replace1=https://bugs.kde.org/show_bug.cgi?id=%2#
-
-[BanList ViewSettings]
-ColumnSortDescending=false
-ColumnSorted=0
-ColumnWidths=100,100,100
-
-[Button List]
-Button0=Op,/OP %u%n
-Button1=DeOp,/DEOP %u%n
-Button2=WhoIs,/WHOIS %s,%%u%n
-Button3=Version,/CTCP %s,%%u VERSION%n
-Button4=Kick,/KICK %u%n
-Button5=Ban,/BAN %u%n
-Button6=Part,/PART %c Leaving...%n
-Button7=Quit,/QUIT Leaving...%n
-
-[Channel 0]
-EnableNotifications=true
-Name=#artix
-Password=
-
-[ChannelOptionsDialog]
-Size=724,536
-SplitterSizes=230,192
-
-[DCC Settings]
-ColumnWidths=49,90,103,173,70,87,157,87,96,165
-IPv4FallbackIface=0
-PanelSplitter=AAAA/wAAAAEAAAACAAAAVAAAAPMB/////wEAAAACAA==
-
-[Flags]
-EncryptionType=1
-
-[General Options]
-ShowTrayIcon=true
-TrayNotify=true
-
-[Highlight List]
-HighlightSoundsEnabled=true
-
-[Identity 0]
-AuthType=nickserv
-AutomaticAway=false
-AutomaticUnaway=false
-AwayInactivity=10
-AwayMessage=
-AwayNick=
-AwayReason=Gone away for now
-Bot=nickserv
-Codec=UTF-8
-Ident=artix-live
-InsertRememberLineOnAway=false
-KickReason=User terminated!
-Nicknames=artix-live-01,artix-live-02,artix-live-03,artix-live-04,artix-live-05,artix-live-06,artix-live-07,artix-live-08,artix-live-09,artix-live-10,artix-live-11,artix-live-12,artix-live-13,artix-live-14,artix-live-15,artix-live-16,artix-live-17,artix-live-18,artix-live-19,artix-live-20,artix-live-21,artix-live-22,artix-live-23,artix-live-24,artix-live-25,artix-live-26,artix-live-27,artix-live-28,artix-live-29,artix-live-30,artix-live-31,artix-live-32,artix-live-33,artix-live-34,artix-live-35,artix-live-36,artix-live-37,artix-live-38,artix-live-39,artix-live-40,artix-live-41,artix-live-42,artix-live-43,artix-live-44,artix-live-45,artix-live-46,artix-live-47,artix-live-48,artix-live-49,artix-live-50
-NickservCommand=identify
-PartReason=Konversation terminated!
-Password=
-PemClientCertFile=
-PreShellCommand=
-QuitReason=Konversation terminated!
-Realname=artix-live
-ReturnMessage=
-SaslAccount=
-ShowAwayMessage=false
-
-[MainWindow]
-Height 768=705
-State=AAAA/wAAAAD9AAAAAAAAAqcAAAKMAAAABAAAAAQAAAAIAAAACPwAAAABAAAAAgAAAAEAAAAWAG0AYQBpAG4AVABvAG8AbABCAGEAcgAAAAAA/////wAAAAAAAAAA
-ToolBarsMovable=Disabled
-Width 1366=679
-
-[Notification Messages]
-ChannelListNoServerSelected=1
-ChannelListWarning=1
-ClearLogfileQuestion=1
-CloseQueryAfterIgnore=1
-HideMenuBarWarning=1
-HideOnCloseInfo=0
-IgnoreNick=1
-Invitation=0
-QuitChannelTab=1
-QuitDCCChatTab=1
-QuitQueryTab=1
-QuitServerTab=1
-QuitWithActiveDccTransfers=1
-ReconnectWithDifferentServer=1
-ReuseExistingConnection=1
-SaveLogfileNote=1
-UnignoreNick=1
-WarnEncodingConflict=1
-systemtrayquitKonversation=1
-
-[Server 0]
-BypassProxy=true
-Password=
-Port=7000
-SSLEnabled=true
-Server=chat.freenode.net
-
-[ServerGroup 0]
-AutoConnect=true
-AutoJoinChannels=Channel 0
-ChannelHistory=Channel 1,Channel 2,Channel 3,Channel 4,Channel 5
-ConnectCommands=
-EnableNotifications=true
-Expanded=true
-Identity=Standardidentität
-Name=freenode
-NotifyList=
-ServerList=Server 0
-
-[ServerListDialog]
-ServerListHeaderState=\x00\x00\x00<30>\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01<30>\x00\x00\x00\x03\x00\x01\x00\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00<30><30><EFBFBD><EFBFBD><EFBFBD>\x00\x00\x00<30>\x00\x00\x00\x00\x00\x00\x00\x03\x00\x00\x00d\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00<30>\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00<30>\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x03<30>\x01\x00\x00\x00<30>
-Size=533,274

lxqt/live-overlay/etc/skel/.local/share/konversation/bookmarks.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE xbel>
-<xbel xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks" xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info" xmlns:kdepriv="http://www.kde.org/kdepriv" dbusName="konversation">
- <bookmark href="irc://freenode/">
-  <title>freenode</title>
-  <info>
-   <metadata owner="http://freedesktop.org">
-    <bookmark:icon name=""/>
-   </metadata>
-  </info>
- </bookmark>
- <bookmark href="ircs://freenode/artix">
-  <title>#artix-unregistered (freenode)</title>
-  <info>
-   <metadata owner="http://freedesktop.org">
-    <bookmark:icon name=""/>
-   </metadata>
-  </info>
- </bookmark>
-</xbel>

lxqt/live-overlay/etc/sudoers.d

@@ -1 +0,0 @@
-../../../base/live-overlay/etc/sudoers.d