Merge pull request #1187 from alick01/master

Changed For 2.2

system/base/baselayout/comar/package.py

@@ -112,6 +112,7 @@ def postInstall(fromVersion, fromRelease, toVersion, toRelease):
     # addGroup(gid, name)
     groups = (
                 (7,   "lp"),
+                (10,  "wheel"),
                 (11,  "cdrom"),
                 (14,  "lpadmin"),
                 (19,  "floppy"),

system/base/baselayout/files/group_fstab.patch

@@ -0,0 +1,22 @@
+--- root/usr/share/baselayout/fstab.orig	2012-10-20 01:50:00.000000000 +0300
++++ root/usr/share/baselayout/fstab	2012-10-20 20:05:53.495958636 +0300
+@@ -2,7 +2,7 @@
+ #
+ # <fs>      <mountpoint> <type> <opts>      <dump/pass>
+ 
+-# /dev/ROOT   /            ext3    noatime        0 1
++# /dev/ROOT   /            ext4    noatime        0 1
+ # /dev/SWAP   none         swap    sw             0 0
+ # /dev/fd0    /mnt/floppy  auto    noauto         0 0
+ 
+
+--- root/usr/share/baselayout/group.orig	2013-01-05 18:36:21.000000000 +0200
++++ root/usr/share/baselayout/group	2013-01-05 18:39:26.943644336 +0300
+@@ -24,6 +24,7 @@
+ at::25:at
+ tape::26:root
+ video::27:root
++users::100:
+ dbus:x:101:dbus
+ hal:x:102:hal
+ polkitd:x:103:polkitd

system/base/baselayout/files/inittab.live

@@ -0,0 +1,36 @@
+# /etc/inittab:
+#
+# This file describes how the INIT process should set up
+# the system in a certain run-level.
+
+# Default runlevel.
+id:3:initdefault:
+
+# System initialization, mount local filesystems, etc.
+si::sysinit:/sbin/mudur.py sysinit
+
+# Further system initialization, brings up the boot runlevel.
+rc::bootwait:/sbin/mudur.py boot
+
+l0:0:wait:/sbin/mudur.py shutdown
+l1:1:wait:/sbin/mudur.py single
+l2:2:wait:/sbin/mudur.py default
+l3:3:wait:/sbin/mudur.py default
+l4:4:wait:/sbin/mudur.py default
+l5:5:wait:/sbin/mudur.py default
+l6:6:wait:/sbin/mudur.py reboot
+#z6:6:respawn:/sbin/sulogin
+
+c1:2345:respawn:/sbin/mingetty --noclear --autologin root tty1
+c2:2345:respawn:/sbin/mingetty --noclear --autologin root tty2
+c3:2345:respawn:/sbin/mingetty --noclear --autologin root tty3
+c4:2345:respawn:/sbin/mingetty --noclear --autologin root tty4
+c5:2345:respawn:/sbin/mingetty --noclear --autologin root tty5
+c6:2345:respawn:/sbin/mingetty --noclear --autologin root tty6
+
+# SERIAL CONSOLES
+#s0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100
+#s1:12345:respawn:/sbin/agetty 9600 ttyS1 vt100
+
+# What to do at the "Three Finger Salute".
+ca:12345:ctrlaltdel:/sbin/shutdown -r now

system/base/baselayout/files/os-release

@@ -1,8 +1,8 @@
 NAME=PisiLinux
 ID=pisilinux
 VERSION="2"
-VERSION_CODENAME=Mehmetcik
-VERSION_ID="2.1.2"
-PRETTY_NAME="PisiLinux 2.1.2 Mehmetcik"
+VERSION_CODENAME=StayHome
+VERSION_ID="2.2"
+PRETTY_NAME="PisiLinux 2.2 StayHome"
 HOME_URL="https://www.pisilinux.org/"
 BUG_REPORT_URL="https://github.com/pisilinux/main/issues"

system/base/baselayout/files/pisilinux-release

@@ -1 +1 @@
-Pisi_Linux 2.1.2
+PisiLinux 2.2

system/base/baselayout/pspec.xml

@@ -15,6 +15,9 @@
         <Summary>Filesystem baselayout</Summary>
         <Description>baselayout creates the Pisi Linux Linux main filesystem hierarchy.</Description>
         <Archive sha1sum="01938089490008e73aae63cf8917a848736e2f7c" type="targz">https://sourceforge.net/projects/pisilinux/files/source/baselayout-3.10.1.tar.gz</Archive>
+        <Patches>
+            <Patch>group_fstab.patch</Patch>
+        </Patches>
     </Source>
 
     <Package>
@@ -49,14 +52,12 @@
             <!-- Update these from fedora's setup package -->
             <AdditionalFile owner="root" permission="0644" target="/etc/services">services</AdditionalFile>
             <AdditionalFile owner="root" permission="0644" target="/etc/protocols">protocols</AdditionalFile>
-
             <AdditionalFile owner="root" permission="0644" target="/etc/sysctl.conf">sysctl.conf</AdditionalFile>
-
+            <AdditionalFile owner="root" permission="0644" target="/usr/share/baselayout/inittab.live">inittab.live</AdditionalFile>
             <!-- Release file for Pisi Linux, there's another in lsb-release package -->
             <AdditionalFile owner="root" permission="0644" target="/etc/pisilinux-release">pisilinux-release</AdditionalFile>
             <!-- os-release file for same package need this (fwupd) -->
             <AdditionalFile owner="root" permission="0644" target="/etc/os-release">os-release</AdditionalFile>
-
             <!-- Should be dropped after switching to systemd as the only user is COMAR -->
             <AdditionalFile owner="root" permission="0644" target="/usr/share/man/man8/start-stop-daemon.8">start-stop-daemon.8</AdditionalFile>
         </AdditionalFiles>
@@ -69,6 +70,13 @@
     </Package>
 
     <History>
+        <Update release="13">
+            <Date>2021-02-12</Date>
+            <Version>3.10.1</Version>
+            <Comment>Rebuild.For 2.2</Comment>
+            <Name>Ali Cengiz Kurt</Name>
+            <Email>alicengizkurt@gmail.com</Email>
+        </Update>
 		<Update release="12">
             <Date>2019-12-26</Date>
             <Version>3.10.1</Version>