Merge pull request #820 from ertugerata/master

add 2 group and os-release file

system/base/baselayout/comar/package.py

@@ -119,7 +119,8 @@ def postInstall(fromVersion, fromRelease, toVersion, toRelease):
                 (22,  "sshd"),
                 (30,  "squid"),
                 (32,  "rpc"),
-                #(46,  "plugdev"),
+                # libftdi need plugdev
+                (46,  "plugdev"),
                 (50,  "named"),
                 # For systemd/var-lock.mount
                 (54,  "lock"),
@@ -128,7 +129,7 @@ def postInstall(fromVersion, fromRelease, toVersion, toRelease):
                 (80,  "apache"),
                 (90,  "dovecot"),
                 (100, "users"),
-                (102, "hal"),
+                (102, "input"),
                 (103, "polkitd"),
                 (104, "postfix"),
                 (105, "postdrop"),
@@ -221,7 +222,6 @@ def postInstall(fromVersion, fromRelease, toVersion, toRelease):
                 (70,  "postgres", "PostgreSQL", "/var/lib/postgresql", "/bin/false", "", ["postgres"], [], []),
                 (80,  "apache", "Apache", "/dev/null", "/bin/false", "", ["apache", "svn"], [], []),
                 (90,  "dovecot", "Dovecot", "/dev/null", "/bin/false", "", ["dovecot"], [], []),
-                (102, "hal", "HAL", "/dev/null", "/bin/false", "", ["hal"], [], []),
                 (103, "polkitd", "PolicyKit", "/var/lib/polkit-1", "/bin/false", "", ["polkitd"], [], []),
                 (104, "postfix", "Postfix", "/var/spool/postfix", "/bin/false", "", ["postfix"], [], []),
                 (106, "smmsp", "smmsp", "/var/spool/mqueue", "/bin/false", "", ["smmsp"], [], []),
@@ -259,7 +259,6 @@ def postInstall(fromVersion, fromRelease, toVersion, toRelease):
                 (162, "privoxy", "Privoxy", "/etc/privoxy", "/sbin/nologin", "", ["privoxy"], [], []),
                 (163, "qemu", "qemu user", "/", "/sbin/nologin", "", ["qemu", "kvm"], [], []),
                 (164, "polipo", "polipo user", "/", "/sbin/nologin", "", ["polipo"], [], []),
-                (165, "kdm", "kdm", "/var", "/sbin/nologin", "", ["kdm"], [], []),
                 (166, "nginx", "nginx user", "/etc/nginx", "/sbin/nologin", "", ["nginx"], [], []),
                 (167, "ntop", "ntop user", "/var/lib/ntop", "/sbin/nologin", "", ["ntop"], [], []),
                 (168, "smolt", "smolt user", "/dev/null", "/bin/false", "", [], [], []),

system/base/baselayout/files/os-release

@@ -0,0 +1,8 @@
+NAME=PisiLinux
+ID=pisilinux
+VERSION="2"
+VERSION_CODENAME=Atatürk
+VERSION_ID="2.0"
+PRETTY_NAME="PisiLinux 2.0 Atatürk"
+HOME_URL="https://www.pisilinux.org/"
+BUG_REPORT_URL="https://github.com/pisilinux/main/issues"

system/base/baselayout/pspec.xml

@@ -54,6 +54,8 @@
 
             <!-- 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>
@@ -67,6 +69,13 @@
     </Package>
 
     <History>
+        <Update release="7">
+            <Date>2018-11-28</Date>
+            <Version>3.10.1</Version>
+            <Comment>add new group; input - plugdev.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
          <Update release="6">
             <Date>2018-11-14</Date>
             <Version>3.10.1</Version>