fixed initd files

8 files changed, 177 insertions, 181 deletions

diff --git a/repo/meta/all.xibuild b/repo/meta/all.xibuild
index 53452e7..286a254 100644
--- a/repo/meta/all.xibuild
+++ b/repo/meta/all.xibuild
@@ -2,4 +2,4 @@
 # This file was automatically generated, do not edit!
 
 DESC="AlL tHe pacKageS!!"
-DEPS=" feh lynx rxvt-unicode vim xterm asciidoc autoconf2-13 autoconf-archive autoconf automake bc bison check clang cmake-extra cmake-modules cmake dejagnu distcc docbook4-xml docbook-dtd docbook-xml docbook-xsl expect flex gcc gdb git go gtk-doc help2man icecream itstool llvm m4 make meson mpc nasm ninja patch pkg-config rustc scdoc sgml-common swig texinfo xmlto encodings font-adobe-utopia-type1 font-alias font-bh-ttf font-bh-type1 fontconfig font-ibm-type1 font-misc-ethiopic font-util font-xfree86-type1 linux-firmware linux-headers linux alsa-firmware alsa-lib alsa-plugins alsa-tools alsa-utils audiofile faac faad2 fdk-aac flac libogg libsamplerate libsndfile libtheora libvorbis libvpx opus pipewire pulseaudio python-alabaster python-appdirs python-babel python-certifi python-chardet python-docutils python-html5lib python-idna python-imagesize python-Jinja2 python-jinja python-lxml python-mach python-mako python-markupsafe python-packaging python-pip python-pygments python-pyparsing python-pytz python-requests python-six python-snowballstemmer python-sphinx-alabaster-theme python-sphinxcontrib-applehelp python-sphinxcontrib-devhelp python-sphinxcontrib-htmlhelp python-sphinxcontrib-jsmath python-sphinxcontrib-qthelp python-sphinxcontrib-serializinghtml python-sphinx python-urllib3 python-webencodings python alsa-oss audit cacert-utils fakechroot fakeroot icecream-sundae polybar xf86-video-qxl xf86-video-vga acl acpid argp-standalone attr binutils bootscripts brotli bzip2 cacerts dbus dhcp efibootmgr efivar elfutils elogind eudev execline expat findutils freetype2 gc gdbm gettext glib gmp gnutls gobject-introspection gperf grub guile gzip hwids iana-etc icu imlib2 intltool js78 jsoncpp kbd kmod krb5 ldns libarchive libcap-ng libcap libdwarf libedit libelf libffi libgcrypt libgpg-error libgudev libidn libldap liblinear libndp libnghttp libnl libnsl libp11-kit libpcap libpipeline libpng libpsl libptytty libsasl libseccomp libsigsegv libssh2 libtasn1 libtirpc libtool libunistring libusb libuv libxcrypt libxml2 libxslt lua lz4 lzo mpfr mtdev musl-fts musl-legacy-compat musl-obstack musl ncurses nettle networkmanager newt nspr nsss nss openrc openssl pahole pam pcre2 pcre perl perl-xml-parser polkit popt psmisc queue-standalone readline rtmpdump sbase sed shadow sh skalibs slang sqlite3 sysklogd syslinux tar tcl tomlc99 ubase udev-rules utmps xxhash xz zip zlib zstd acpi base64 bash cpio curl dash diffutils dosfstools dracut e2fsprogs file fzf gawk genfstab grep groff htop ifupdown-ng inetutils iproute2 iw keyutils less lm-sensors man-db neofetch net-tools nmap openssh pciutils pm-utils procps-ng rhash rsync sudo unzip usbutils util-linux webfs wget which wireless-tools wpa_supplicant bspwm iceauth intel-vaapi-driver libdmx libdrm libepoxy libevdev libfontenc libfs libice libinput libpciaccess libsm libva libvdpau-va-gl libvdpau libwacom libx11 libxau libxaw libxcb libxcomposite libxcursor libxcvt libxdamage libxdmcp libxext libxfixes libxfont2 libxft libxinerama libxi libxkbfile libxmu libxpm libxrandr libxrender libxres libxscrnsaver libxshmfence libxtst libxt libxvmc libxv libxxf86dga libxxf86vm luit mesa mkfontscale pixman sessreg setxkbmap smproxy sxhkd wayland-protocols wayland x11perf xauth xbacklight xbitmaps xcb-proto xcb-util-cursor xcb-util-image xcb-util-keysyms xcb-util-renderutil xcb-util-wm xcb-util xclock xcmsdb xcursorgen xcursor-themes xdpyinfo xdriinfo xev xeyes xf86-input-evdev xf86-input-libinput xf86-input-synaptics xf86-input-wacom xf86-video-amdgpu xf86-video-ati xf86-video-fbdev xf86-video-intel xf86-video-nouveau xf86-video-vmware xgamma xhost xinput xkbcomp xkbevd xkbutils xkeyboardconfig xkill xlsatoms xlsclients xmessage xmodmap xorg-libs xorgproto xorg-server xorg-util-macros xorg-xinit xprop xpr xrandr xrdb xrefresh xsetroot xset xtrans xvinfo xwd xwininfo xwud mkinitramfs sysconfigs xib xichroot xipkg xiutils"
+DEPS=" feh lynx rxvt-unicode vim xterm asciidoc autoconf2-13 autoconf-archive autoconf automake bc bison check clang cmake-extra cmake-modules cmake dejagnu distcc docbook4-xml docbook-dtd docbook-xml docbook-xsl expect flex gcc gdb git go gtk-doc help2man icecream itstool llvm m4 make meson mpc nasm ninja patch pkg-config rustc scdoc sgml-common swig texinfo xmlto encodings font-adobe-utopia-type1 font-alias font-bh-ttf font-bh-type1 fontconfig font-ibm-type1 font-misc-ethiopic font-util font-xfree86-type1 linux-firmware linux-headers linux alsa-firmware alsa-lib alsa-plugins alsa-tools alsa-utils audiofile faac faad2 fdk-aac flac libogg libsamplerate libsndfile libtheora libvorbis libvpx opus pipewire pulseaudio python-alabaster python-appdirs python-babel python-certifi python-chardet python-docutils python-html5lib python-idna python-imagesize python-Jinja2 python-jinja python-lxml python-mach python-mako python-markupsafe python-packaging python-pip python-pygments python-pyparsing python-pytz python-requests python-six python-snowballstemmer python-sphinx-alabaster-theme python-sphinxcontrib-applehelp python-sphinxcontrib-devhelp python-sphinxcontrib-htmlhelp python-sphinxcontrib-jsmath python-sphinxcontrib-qthelp python-sphinxcontrib-serializinghtml python-sphinx python-urllib3 python-webencodings python alsa-oss audit cacert-utils fakechroot fakeroot icecream-sundae polybar xf86-video-qxl xf86-video-vga acl acpid argp-standalone attr binutils brotli bzip2 cacerts dbus dhcp efibootmgr efivar elfutils elogind eudev execline expat findutils freetype2 gc gdbm gettext glib gmp gnutls gobject-introspection gperf grub guile gzip hwids iana-etc icu imlib2 intltool js78 jsoncpp kbd kmod krb5 ldns libarchive libcap-ng libcap libdwarf libedit libelf libffi libgcrypt libgpg-error libgudev libidn libldap liblinear libndp libnghttp libnl libnsl libp11-kit libpcap libpipeline libpng libpsl libptytty libsasl libseccomp libsigsegv libssh2 libtasn1 libtirpc libtool libunistring libusb libuv libxcrypt libxml2 libxslt lua lz4 lzo mpfr mtdev musl-fts musl-legacy-compat musl-obstack musl ncurses nettle networkmanager newt nspr nsss nss openrc openssl pahole pam pcre2 pcre perl perl-xml-parser polkit popt psmisc queue-standalone readline rtmpdump sbase sed shadow sh skalibs slang sqlite3 sysklogd syslinux tar tcl tomlc99 ubase udev-rules utmps xxhash xz zip zlib zstd acpi base64 bash cpio curl dash diffutils dosfstools dracut e2fsprogs file fzf gawk genfstab grep groff htop ifupdown-ng inetutils iproute2 iw keyutils less lm-sensors man-db neofetch net-tools nmap openssh pciutils pm-utils procps-ng rhash rsync sudo unzip usbutils util-linux webfs wget which wireless-tools wpa_supplicant bspwm iceauth intel-vaapi-driver libdmx libdrm libepoxy libevdev libfontenc libfs libice libinput libpciaccess libsm libva libvdpau-va-gl libvdpau libwacom libx11 libxau libxaw libxcb libxcomposite libxcursor libxcvt libxdamage libxdmcp libxext libxfixes libxfont2 libxft libxinerama libxi libxkbfile libxmu libxpm libxrandr libxrender libxres libxscrnsaver libxshmfence libxtst libxt libxvmc libxv libxxf86dga libxxf86vm luit mesa mkfontscale pixman sessreg setxkbmap smproxy sxhkd wayland-protocols wayland x11perf xauth xbacklight xbitmaps xcb-proto xcb-util-cursor xcb-util-image xcb-util-keysyms xcb-util-renderutil xcb-util-wm xcb-util xclock xcmsdb xcursorgen xcursor-themes xdpyinfo xdriinfo xev xeyes xf86-input-evdev xf86-input-libinput xf86-input-synaptics xf86-input-wacom xf86-video-amdgpu xf86-video-ati xf86-video-fbdev xf86-video-intel xf86-video-nouveau xf86-video-vmware xgamma xhost xinput xkbcomp xkbevd xkbutils xkeyboardconfig xkill xlsatoms xlsclients xmessage xmodmap xorg-libs xorgproto xorg-server xorg-util-macros xorg-xinit xprop xpr xrandr xrdb xrefresh xsetroot xset xtrans xvinfo xwd xwininfo xwud mkinitramfs sysconfigs xib xichroot xipkg xiutils"
diff --git a/repo/meta/repo-system.xibuild b/repo/meta/repo-system.xibuild
index 752f623..37ef7ae 100644
--- a/repo/meta/repo-system.xibuild
+++ b/repo/meta/repo-system.xibuild
@@ -2,4 +2,4 @@
 # This file was automatically generated, do not edit!
 
 DESC="All the the packages available in system"
-DEPS=" acl acpid argp-standalone attr binutils bootscripts brotli bzip2 cacerts dbus dhcp efibootmgr efivar elfutils elogind eudev execline expat findutils freetype2 gc gdbm gettext glib gmp gnutls gobject-introspection gperf grub guile gzip hwids iana-etc icu imlib2 intltool js78 jsoncpp kbd kmod krb5 ldns libarchive libcap-ng libcap libdwarf libedit libelf libffi libgcrypt libgpg-error libgudev libidn libldap liblinear libndp libnghttp libnl libnsl libp11-kit libpcap libpipeline libpng libpsl libptytty libsasl libseccomp libsigsegv libssh2 libtasn1 libtirpc libtool libunistring libusb libuv libxcrypt libxml2 libxslt lua lz4 lzo mpfr mtdev musl-fts musl-legacy-compat musl-obstack musl ncurses nettle networkmanager newt nspr nsss nss openrc openssl pahole pam pcre2 pcre perl perl-xml-parser polkit popt psmisc queue-standalone readline rtmpdump sbase sed shadow sh skalibs slang sqlite3 sysklogd syslinux tar tcl tomlc99 ubase udev-rules utmps xxhash xz zip zlib zstd"
+DEPS=" acl acpid argp-standalone attr binutils brotli bzip2 cacerts dbus dhcp efibootmgr efivar elfutils elogind eudev execline expat findutils freetype2 gc gdbm gettext glib gmp gnutls gobject-introspection gperf grub guile gzip hwids iana-etc icu imlib2 intltool js78 jsoncpp kbd kmod krb5 ldns libarchive libcap-ng libcap libdwarf libedit libelf libffi libgcrypt libgpg-error libgudev libidn libldap liblinear libndp libnghttp libnl libnsl libp11-kit libpcap libpipeline libpng libpsl libptytty libsasl libseccomp libsigsegv libssh2 libtasn1 libtirpc libtool libunistring libusb libuv libxcrypt libxml2 libxslt lua lz4 lzo mpfr mtdev musl-fts musl-legacy-compat musl-obstack musl ncurses nettle networkmanager newt nspr nsss nss openrc openssl pahole pam pcre2 pcre perl perl-xml-parser polkit popt psmisc queue-standalone readline rtmpdump sbase sed shadow sh skalibs slang sqlite3 sysklogd syslinux tar tcl tomlc99 ubase udev-rules utmps xxhash xz zip zlib zstd"
diff --git a/repo/system/acpid.xibuild b/repo/system/acpid.xibuild
index 55a4e6f..f960ac0 100644
--- a/repo/system/acpid.xibuild
+++ b/repo/system/acpid.xibuild
@@ -7,11 +7,14 @@ PKG_VER=2.0.33
 SOURCE=https://downloads.sourceforge.net/acpid2/acpid-$PKG_VER.tar.xz
 DESC="Daemon for battery, power, and thermal readings"
 
-BOOTSCRIPTS=blfs-bootscripts-20210826
 ADDITIONAL="
-        https://anduin.linuxfromscratch.org/BLFS/blfs-bootscripts/$BOOTSCRIPTS.tar.xz
-    "
-
+    acpid.confd
+    acpid.initd
+    anything
+    handler.sh
+    lid-closed
+    power-supply-ac
+"
 build () {
     ./configure --prefix=/usr \
             --docdir=/usr/share/doc/acpid-$PKG_VER &&
@@ -20,10 +23,15 @@ build () {
 
 package () {
     make DESTDIR=$PKG_DEST install 
-    install -v -m755 -d $PKG_DEST/etc/acpi/events &&
+    install -m755 -d $PKG_DEST/etc/acpi/events &&
     cp -r samples $PKG_DEST/usr/share/doc/acpid-$PKG_VER
 
-    tar xf $BOOTSCRIPTS.tar.xz
-    cd $BOOTSCRIPTS
-    make DESTDIR=$PKG_DEST install-acpid
+    install -D -m 755 handler.sh etc/acpi/handler.sh
+	install -D -m 644 anything etc/acpi/events/anything
+	install -D -m 755 power-supply-ac usr/share/acpid/
+	install -D -m 755 lid-closed usr/share/acpid/
+
+	install -D -m 755 acpid.initd etc/init.d/acpid
+	install -D -m 644 acpid.confd etc/conf.d/acpid
+
 }
diff --git a/repo/system/dbus.xibuild b/repo/system/dbus.xibuild
index e1a0e72..795d2d7 100644
--- a/repo/system/dbus.xibuild
+++ b/repo/system/dbus.xibuild
@@ -5,10 +5,12 @@ DEPS="elogind"
 
 PKG_VER=1.12.20
 SOURCE=https://dbus.freedesktop.org/releases/dbus/dbus-$PKG_VER.tar.gz
-BOOTSCRIPTS=blfs-bootscripts-20210826
+
 ADDITIONAL="
-        https://anduin.linuxfromscratch.org/BLFS/blfs-bootscripts/$BOOTSCRIPTS.tar.xz
-    "
+dbus.confd
+dbus.initd
+dbus.trigger
+"
 
 DESC="A message bus system allowing applications to talk to one another"
 
@@ -25,7 +27,8 @@ build () {
             --docdir=/usr/share/doc/dbus-$PKG_VER \
             --with-console-auth-dir=/run/console \
             --with-system-pid-file=/run/dbus/pid \
-            --with-system-socket=/run/dbus/system_bus_socket &&
+            --with-system-socket=/run/dbus/system_bus_socket \
+            --with-x &&
     make
 }
 
@@ -47,7 +50,6 @@ package () {
 </busconfig>
 EOF
 
-    tar xf $BOOTSCRIPTS.tar.xz
-    cd $BOOTSCRIPTS
-    make DESTDIR=$PKG_DEST install-dbus
+    install -Dm755 dbus.initd $PKG_DEST/etc/init.d/dbus
+	install -Dm644 dbus.confd $PKG_DEST/etc/conf.d/dbus
 }
diff --git a/repo/system/dhcp.xibuild b/repo/system/dhcp.xibuild
index b8f5d9d..241dee1 100644
--- a/repo/system/dhcp.xibuild
+++ b/repo/system/dhcp.xibuild
@@ -6,14 +6,19 @@ DEPS="musl libldap"
 PKG_VER=4.4.3b1
 SOURCE=https://ftp.isc.org/isc/dhcp/$PKG_VER/dhcp-$PKG_VER.tar.gz
 
-BOOTSCRIPTS=blfs-bootscripts-20210826
 ADDITIONAL="
-        https://anduin.linuxfromscratch.org/BLFS/blfs-bootscripts/$BOOTSCRIPTS.tar.xz
-    "
+01-dhclient-script-fix-bare-ip.patch
+02-dhclient-script-remove-bashisms.patch
+03-fix-unwind-import.patch
+dhcpd.confd
+dhcpd.initd
+"
 
 DESC="A DHCP server, client and relay"
 
 package () {
+    apply_patches
+    
     sed -i '/o.*dhcp_type/d' server/mdb.c &&
     sed -r '/u.*(local|remote)_port/d'    \
         -i client/dhclient.c              \
@@ -22,52 +27,43 @@ package () {
 
 
 build () {
-    ( export CFLAGS="${CFLAGS:--g -O2} -Wall -fno-strict-aliasing                 \
-        -D_PATH_DHCLIENT_SCRIPT='\"/usr/sbin/dhclient-script\"'     \
-        -D_PATH_DHCPD_CONF='\"/etc/dhcp/dhcpd.conf\"'               \
-        -D_PATH_DHCLIENT_CONF='\"/etc/dhcp/dhclient.conf\"'"        &&
-
-./configure --prefix=/usr                                           \
-            --sysconfdir=/etc/dhcp                                  \
-            --localstatedir=/var                                    \
-            --with-srv-lease-file=/var/lib/dhcpd/dhcpd.leases       \
-            --with-srv6-lease-file=/var/lib/dhcpd/dhcpd6.leases     \
-            --with-cli-lease-file=/var/lib/dhclient/dhclient.leases \
-            --with-cli6-lease-file=/var/lib/dhclient/dhclient6.leases
-) &&
-make -j1
+    # fix ipv6
+
+    export CFLAGS="$CFLAGS -D_GNU_SOURCE \
+    -D_PATH_DHCLIENT_CONF='\"/etc/dhcp/dhclient.conf\"'"
 
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc/dhcp \
+		--localstatedir=/var \
+		--with-srv-conf-file=/etc/dhcp/dhcpd.conf \
+		--with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \
+		--with-srv6-lease-file=/var/lib/dhcp/dhcpd6.leases \
+		--with-cli-lease-file=/var/lib/dhcp/dhclient.leases \
+		--with-cli6-lease-file=/var/lib/dhcp/dhclient6.leases \
+		--with-srv-pid-file=/run/dhcp/dhcpd.pid \
+		--with-srv6-pid-file=/run/dhcp/dhcpd6.pid \
+		--with-cli-pid-file=/run/dhcp/dhclient.pid \
+		--with-cli6-pid-file=/run/dhcp/dhclient6.pid \
+		--with-relay-pid-file=/run/dhcp/dhcrelay.pid \
+		--with-relay6-pid-file=/run/dhcp/dhcrelay6.pid \
+		--with-libbind=no \
+		--enable-dhcpv4o6 \
+		--enable-paranoia \
+		--enable-log-pid \
+
+    make -j1 -C bind && make
 }
 
 package () {
-    make -C client DESTDIR=$PKG_DEST install             &&
-    install -m755 client/scripts/linux $PKG_DEST/usr/sbin/dhclient-script
-
-    install -dm755 /etc/dhcp &&
-        cat > $PKG_DEST/etc/dhcp/dhclient.conf << "EOF"
-# Begin /etc/dhcp/dhclient.conf
-#
-# Basic dhclient.conf(5)
-
-#prepend domain-name-servers 127.0.0.1;
-request subnet-mask, broadcast-address, time-offset, routers,
-        domain-name, domain-name-servers, domain-search, host-name,
-        netbios-name-servers, netbios-scope, interface-mtu,
-        ntp-servers;
-require subnet-mask, domain-name-servers;
-#timeout 60;
-#retry 60;
-#reboot 10;
-#select-timeout 5;
-#initial-interval 2;
-
-# End /etc/dhcp/dhclient.conf
-EOF
-    install -dm 755 $PKG_DEST/var/lib/dhclient
-    
-    tar xf $BOOTSCRIPTS.tar.xz
-    cd $BOOTSCRIPTS
-    make DESTDIR=$PKG_DEST install-service-dhclient
+    make DESTDIR=$PKG_DEST install
+
+    install -d $PKG_DEST/var/lib/dhcp
+	install -d $PKG_DEST/run/dhcp
+
+
+	install -m755 -D dhcpd.initd $PKG_DEST/etc/init.d/dhcpd
+	install -m644 -D dhcpd.confd $PKG_DEST/etc/conf.d/dhcpd
 
 }
 
diff --git a/repo/system/networkmanager.xibuild b/repo/system/networkmanager.xibuild
index f48cca3..c2c8fbd 100644
--- a/repo/system/networkmanager.xibuild
+++ b/repo/system/networkmanager.xibuild
@@ -6,10 +6,12 @@ DEPS="jansson libndp curl wpa_supplicant newt nss polkit libpsl dbus gobject-int
 PKG_VER=1.35.5
 SOURCE=https://download.gnome.org/sources/NetworkManager/${PKG_VER%.*}/NetworkManager-$PKG_VER.tar.xz
 
-BOOTSCRIPTS=blfs-bootscripts-20210826
 ADDITIONAL="
-        https://anduin.linuxfromscratch.org/BLFS/blfs-bootscripts/$BOOTSCRIPTS.tar.xz
-    "
+networkmanager.conf
+networkmanager-dispatcher.initd
+networkmanager.initd
+networkmanager.rules
+"
 
 DESC="Network connection manager and user applications"
 
@@ -42,25 +44,13 @@ build () {
 package () {
     DESTDIR=$PKG_DEST ninja install &&
     mv $PKG_DEST/usr/share/doc/NetworkManager \
-     $PKG_DEST/usr/share/doc/NetworkManager-$PKG_VER}
+     $PKG_DEST/usr/share/doc/NetworkManager-$PKG_VER
 
-    # create minimum config file
-    cat >> $PKG_DEST/etc/NetworkManager/NetworkManager.conf << "EOF"
-[main]
-plugins=keyfile
-EOF
-    cat > $PKG_DEST/etc/NetworkManager/conf.d/polkit.conf << "EOF"
-[main]
-auth-polkit=true
-EOF
-
-cat > $PKG_DEST/etc/NetworkManager/conf.d/dhcp.conf << "EOF"
-[main]
-dhcp=dhclient
-EOF
+	install -m644 -D networkmanager.rules \
+		"$PKG_DEST/usr/share/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
 
     cd ..
-    tar xf $BOOTSCRIPTS.tar.xz
-    cd $BOOTSCRIPTS
-    make DESTDIR=$PKG_DEST install-networkmanager
+	install -m755 -D networkmanager.initd $PKG_DEST/etc/init.d/networkmanager
+	install -m755 -D networkmanager-dispatcher.initd $PKG_DEST/etc/init.d/networkmanager-dispatcher
+	install -m755 -D networkmanager.conf $PKG_DEST/etc/NetworkManager/NetworkManager.conf
 }
diff --git a/repo/util/wpa_supplicant.xibuild b/repo/util/wpa_supplicant.xibuild
index a9dca1f..294a9f4 100644
--- a/repo/util/wpa_supplicant.xibuild
+++ b/repo/util/wpa_supplicant.xibuild
@@ -69,9 +69,17 @@ package () {
                      $PKG_DEST/etc/dbus-1/system.d/wpa_supplicant.conf
     
     cd ..
-    tar xf $BOOTSCRIPTS.tar.xz
-    cd $BOOTSCRIPTS
-    make DESTDIR=$PKG_DEST install-service-wpa
+
+    # openrc runscripts
+	install -Dm755 wpa_supplicant.initd \
+		$PKG_DEST/etc/init.d/wpa_supplicant
+	install -Dm644 wpa_supplicant.confd \
+		$PKG_DEST/etc/conf.d/wpa_supplicant
+	install -Dm755 wpa_cli.initd \
+		$PKG_DEST/etc/init.d/wpa_cli
+	install -Dm644 wpa_cli.confd \
+		$PKG_DEST/etc/conf.d/wpa_cli
+
 }
 
 
diff --git a/repo/xi/sysconfigs.xibuild b/repo/xi/sysconfigs.xibuild
index 92acddb..1dadea9 100644
--- a/repo/xi/sysconfigs.xibuild
+++ b/repo/xi/sysconfigs.xibuild
@@ -9,94 +9,95 @@ DESC="Default system configs for xilinux"
 package () {
     mkdir -p $PKG_DEST/etc/
     mkdir -p $PKG_DEST/etc/sysconfig
-    cat > $PKG_DEST/etc/sysconfig/rc.site << "EOF"
-# rc.site
 
-# Distro Information
-DISTRO="xilinux" # The distro name
-DISTRO_CONTACT="xi@davidovski.xyz" # Bug report address
-DISTRO_MINI="xi" # Short name used in filenames for distro config
-
-# Define custom colors used in messages printed to the screen
-
-# Please consult `man console_codes` for more information
-# under the "ECMA-48 Set Graphics Rendition" section
+#    cat > $PKG_DEST/etc/sysconfig/rc.site << "EOF"
+## rc.site
+#
+## Distro Information
+#DISTRO="xilinux" # The distro name
+#DISTRO_CONTACT="xi@davidovski.xyz" # Bug report address
+#DISTRO_MINI="xi" # Short name used in filenames for distro config
+#
+## Define custom colors used in messages printed to the screen
+#
+## Please consult `man console_codes` for more information
+## under the "ECMA-48 Set Graphics Rendition" section
+##
+## Warning: when switching from a 8bit to a 9bit font,
+## the linux console will reinterpret the bold (1;) to
+## the top 256 glyphs of the 9bit font.  This does
+## not affect framebuffer consoles
+#
+#BRACKET="\\033[1;34m" # Blue
+#FAILURE="\\033[1;31m" # Red
+#INFO="\\033[1;36m"    # Cyan
+#NORMAL="\\033[0;39m"  # Grey
+#SUCCESS="\\033[1;32m" # Green
+#WARNING="\\033[1;33m" # Yellow
+#
+## Use a colored prefix
+#BMPREFIX="      "
+#SUCCESS_PREFIX="${SUCCESS}  *  ${NORMAL} "
+#FAILURE_PREFIX="${FAILURE}*****${NORMAL} "
+#WARNING_PREFIX="${WARNING} *** ${NORMAL} "
+#
+## Manually seet the right edge of message output (characters)
+## Useful when resetting console font during boot to override
+## automatic screen width detection
+##COLUMNS=120
+#
+## Interactive startup
+##IPROMPT="yes" # Whether to display the interactive boot prompt
+##itime="3"    # The amount of time (in seconds) to display the prompt
+#
+## The total length of the distro welcome string, without escape codes
+#wlen=$(echo "Welcome to ${DISTRO}" | wc -c )
+#welcome_message="Welcome to ${INFO}${DISTRO}${NORMAL}"
+#
+## The total length of the interactive string, without escape codes
+##ilen=$(echo "Press 'I' to enter interactive startup" | wc -c )
+##i_message="Press '${FAILURE}I${NORMAL}' to enter interactive startup"
+#
+## Set scripts to skip the file system check on reboot
+##FASTBOOT=yes
+#
+## Skip reading from the console
+##HEADLESS=yes
+#
+## Write out fsck progress if yes
+##VERBOSE_FSCK=no
+#
+## Speed up boot without waiting for settle in udev
+##OMIT_UDEV_SETTLE=y
+#
+## Speed up boot without waiting for settle in udev_retry
+##OMIT_UDEV_RETRY_SETTLE=yes
+#
+## Skip cleaning /tmp if yes
+##SKIPTMPCLEAN=no
+#
+## For setclock
+#UTC=1
+##CLOCKPARAMS=
+#
+## For consolelog (Note that the default, 7=debug, is noisy)
+##LOGLEVEL=7
+#
+## For network
+#HOSTNAME=xi
+#
+## Delay between TERM and KILL signals at shutdown
+##KILLDELAY=3
+#
+## Optional sysklogd parameters
+#SYSKLOGD_PARMS="-m 0"
+#
+## Console parameters
+#UNICODE=1
+#KEYMAP="us"
+#FONT="lat0-16 -m 8859-15"
+#EOF
 #
-# Warning: when switching from a 8bit to a 9bit font,
-# the linux console will reinterpret the bold (1;) to
-# the top 256 glyphs of the 9bit font.  This does
-# not affect framebuffer consoles
-
-BRACKET="\\033[1;34m" # Blue
-FAILURE="\\033[1;31m" # Red
-INFO="\\033[1;36m"    # Cyan
-NORMAL="\\033[0;39m"  # Grey
-SUCCESS="\\033[1;32m" # Green
-WARNING="\\033[1;33m" # Yellow
-
-# Use a colored prefix
-BMPREFIX="      "
-SUCCESS_PREFIX="${SUCCESS}  *  ${NORMAL} "
-FAILURE_PREFIX="${FAILURE}*****${NORMAL} "
-WARNING_PREFIX="${WARNING} *** ${NORMAL} "
-
-# Manually seet the right edge of message output (characters)
-# Useful when resetting console font during boot to override
-# automatic screen width detection
-#COLUMNS=120
-
-# Interactive startup
-#IPROMPT="yes" # Whether to display the interactive boot prompt
-#itime="3"    # The amount of time (in seconds) to display the prompt
-
-# The total length of the distro welcome string, without escape codes
-wlen=$(echo "Welcome to ${DISTRO}" | wc -c )
-welcome_message="Welcome to ${INFO}${DISTRO}${NORMAL}"
-
-# The total length of the interactive string, without escape codes
-#ilen=$(echo "Press 'I' to enter interactive startup" | wc -c )
-#i_message="Press '${FAILURE}I${NORMAL}' to enter interactive startup"
-
-# Set scripts to skip the file system check on reboot
-#FASTBOOT=yes
-
-# Skip reading from the console
-#HEADLESS=yes
-
-# Write out fsck progress if yes
-#VERBOSE_FSCK=no
-
-# Speed up boot without waiting for settle in udev
-#OMIT_UDEV_SETTLE=y
-
-# Speed up boot without waiting for settle in udev_retry
-#OMIT_UDEV_RETRY_SETTLE=yes
-
-# Skip cleaning /tmp if yes
-#SKIPTMPCLEAN=no
-
-# For setclock
-UTC=1
-#CLOCKPARAMS=
-
-# For consolelog (Note that the default, 7=debug, is noisy)
-#LOGLEVEL=7
-
-# For network
-HOSTNAME=xi
-
-# Delay between TERM and KILL signals at shutdown
-#KILLDELAY=3
-
-# Optional sysklogd parameters
-SYSKLOGD_PARMS="-m 0"
-
-# Console parameters
-UNICODE=1
-KEYMAP="us"
-FONT="lat0-16 -m 8859-15"
-EOF
-
 
     cat > $PKG_DEST/etc/profile << "EOF"
 
@@ -165,13 +166,6 @@ EOF
 
     cat > $PKG_DEST/etc/lsb-release << "EOF"
 LSB_VERSION=1.4
-DISTRIB_ID="xilinux"
-DISTRIB_RELEASE=rolling
-DISTRIB_DESCRIPTION="Xi Linux"
-EOF
-
-    cat > $PKG_DEST/etc/lsb-release << "EOF"
-LSB_VERSION=1.4
 DISTRIB_ID=xi
 DISTRIB_RELEASE=rolling
 DISTRIB_DESCRIPTION="XiLinux"
@@ -187,8 +181,6 @@ DOCUMENTATION_URL="https://xi.davidovski.xyz"
 SUPPORT_URL="https://xi.davidovski.xyz"
 BUG_REPORT_URL="https://xi.davidovski.xyz"
 LOGO=xilinux-logo
-
 EOF
 
-
 }