From b385cd6d7573386f1e9448c3fb856c3091b4fdd3a72e322a80c5b1720ee37ed1 Mon Sep 17 00:00:00 2001 From: Ruediger Meier Date: Tue, 7 Feb 2017 20:47:46 +0000 Subject: [PATCH] Accepting request 455350 from home:sbrabec:branches:util-linux-raw-fate321122 - Update to version 2.29.1: * lscpu: add aarch64 specific names * lubmount: Disable disable ro/rw mtab checks (bsc#1012632) * More details at: https://www.kernel.org/pub/linux/utils/util-linux/v2.29/v2.29.1-ReleaseNotes - Replace raw initscript by a systemd service doing the same thing. Based on previous work of fcrozat@suse.com (FATE#321122). OBS-URL: https://build.opensuse.org/request/show/455350 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=329 --- etc.raw | 6 ++-- python-libmount.changes | 15 +++++++++ python-libmount.spec | 24 +++++++++------ raw.init | 62 -------------------------------------- raw.service | 17 +++++++++++ util-linux-2.29.1.tar.sign | 17 +++++++++++ util-linux-2.29.1.tar.xz | 3 ++ util-linux-2.29.tar.sign | 17 ----------- util-linux-2.29.tar.xz | 3 -- util-linux-systemd.changes | 15 +++++++++ util-linux-systemd.spec | 24 +++++++++------ util-linux.changes | 15 +++++++++ util-linux.spec | 24 +++++++++------ 13 files changed, 127 insertions(+), 115 deletions(-) delete mode 100644 raw.init create mode 100644 raw.service create mode 100644 util-linux-2.29.1.tar.sign create mode 100644 util-linux-2.29.1.tar.xz delete mode 100644 util-linux-2.29.tar.sign delete mode 100644 util-linux-2.29.tar.xz diff --git a/etc.raw b/etc.raw index 6d98cdd..8eff0a0 100644 --- a/etc.raw +++ b/etc.raw @@ -4,12 +4,12 @@ # to block devices # # The format of this file is: -# raw: +# raw: # # example: # --------- -# raw1:hdb1 +# raw1:sdb1 # -# this means: bind /dev/raw/raw1 to /dev/hdb1 +# this means: bind /dev/raw/raw1 to /dev/sdb1 # # ... diff --git a/python-libmount.changes b/python-libmount.changes index ea48eb4..967a5df 100644 --- a/python-libmount.changes +++ b/python-libmount.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Feb 7 20:07:55 CET 2017 - sbrabec@suse.com + +- Update to version 2.29.1: + * lscpu: add aarch64 specific names + * lubmount: Disable disable ro/rw mtab checks (bsc#1012632) + * More details at: + https://www.kernel.org/pub/linux/utils/util-linux/v2.29/v2.29.1-ReleaseNotes + +------------------------------------------------------------------- +Tue Feb 7 18:31:04 CET 2017 - sbrabec@suse.com + +- Replace raw initscript by a systemd service doing the same thing. + Based on previous work of fcrozat@suse.com (FATE#321122). + ------------------------------------------------------------------- Thu Jan 5 12:34:33 UTC 2017 - sweet_f_a@gmx.de diff --git a/python-libmount.spec b/python-libmount.spec index e21be5f..addfaea 100644 --- a/python-libmount.spec +++ b/python-libmount.spec @@ -112,7 +112,7 @@ BuildRequires: libmount-devel %endif %endif #END SECOND STAGE DEPENDENCIES -Version: 2.29 +Version: 2.29.1 Release: 0 # util-linux is a base package and uuidd pre-requiring pwdutils pulls # that into the core build cycle. pwdutils also pulls in the whole @@ -123,7 +123,7 @@ Release: 0 Url: https://www.kernel.org/pub/linux/utils/util-linux/ Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.29/%{_name}-%{version}.tar.xz Source1: util-linux-rpmlintrc -Source4: raw.init +Source4: raw.service Source5: etc.raw Source6: etc_filesystems Source7: baselibs.conf @@ -159,7 +159,6 @@ Provides: fsck-with-dev-lock = %{version} # bnc#651598: Provides: util-linux(fake+no-canonicalize) PreReq: %install_info_prereq permissions -PreReq: %insserv_prereq %fillup_prereq /bin/sed Recommends: %{name}-lang = %{version} Provides: eject = 2.1.0-166.8 Provides: login = 4.0-33.7 @@ -599,7 +598,7 @@ exit "$result" %install %if %build_util_linux -mkdir -p %{buildroot}{%{_sysconfdir}/{init.d,pam.d,default},%{_mandir}/man{1,8},/bin,/sbin,%{_bindir},%{_sbindir},%{_infodir}} +mkdir -p %{buildroot}{%{_sysconfdir}/{pam.d,default},%{_mandir}/man{1,8},/bin,/sbin,%{_bindir},%{_sbindir},%{_infodir}} install -m 644 %{SOURCE51} %{buildroot}%{_sysconfdir}/blkid.conf install -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/pam.d/login install -m 644 %{SOURCE9} %{buildroot}%{_sysconfdir}/pam.d/remote @@ -608,7 +607,6 @@ install -m 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/pam.d/runuser-l install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su-l install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/default/su -mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates pushd ../klogconsole # klogconsole install make install DEST=%{buildroot} @@ -672,8 +670,8 @@ echo -e "#! /bin/bash\n/sbin/blockdev --flushbufs \$1" > %{buildroot}%{_sbindir} chmod 755 %{buildroot}%{_sbindir}/flushb # Install scripts to configure raw devices at boot time install -m 644 $RPM_SOURCE_DIR%{_sysconfdir}.raw %{buildroot}%{_sysconfdir}/raw -install -m 755 $RPM_SOURCE_DIR/raw.init %{buildroot}%{_initddir}/raw -ln -sf ../..%{_sysconfdir}/init.d/raw %{buildroot}%{_sbindir}/rcraw +install -m 644 $RPM_SOURCE_DIR/raw.service %{buildroot}%{_unitdir} +ln -sf service %{buildroot}%{_sbindir}/rcraw # upstream moved getopt examples from datadir to docdir but we keep # the old location because we would need to fix the manpage first mv %{buildroot}%{_docdir}/%{_name}/getopt %{buildroot}%{_datadir}/ @@ -748,8 +746,11 @@ echo -e 'enable uuidd.socket\nenable uuidd.service' >%{buildroot}/usr/lib/system %fdupes -s %{buildroot}%{_prefix} %if %build_util_linux +%pre +%{service_add_pre raw.service} + %post -%{fillup_and_insserv raw} +%{service_add_post raw.service} %set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount %set_permissions %{_bindir}/su # Safely migrate PAM files from coreutils to util-linux @@ -775,8 +776,11 @@ if [ -f etc/fstab ]; then sed -i 's:code=:codepage=:' etc/fstab fi +%preun +%{service_del_preun raw.service} + %postun -%{insserv_cleanup} +%{service_del_postun raw.service} %verifyscript %verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount @@ -860,7 +864,7 @@ fi %doc Documentation/modems-with-agetty.txt %doc Documentation/mount.txt %doc Documentation/pg.txt -%config %attr(744,root,root) %{_sysconfdir}/init.d/raw +%{_unitdir}/raw.service %config(noreplace) %attr(644,root,root) %{_sysconfdir}/raw %config(noreplace) %{_sysconfdir}/filesystems %config(noreplace) %{_sysconfdir}/blkid.conf diff --git a/raw.init b/raw.init deleted file mode 100644 index 3b5d849..0000000 --- a/raw.init +++ /dev/null @@ -1,62 +0,0 @@ -#! /bin/sh -# Copyright (c) 1995-2001 SuSE GmbH Nuernberg, Germany. -# -# Author: Dirk Lerner -# -# /etc/init.d/raw -# -# and symbolic its link -# -# /usr/sbin/rcraw -# -### BEGIN INIT INFO -# Provides: raw -# Required-Start: $local_fs $remote_fs -# Required-Stop: $local_fs $remote_fs -# Default-Start: 2 3 5 -# Default-Stop: 0 1 6 -# Short-Description: raw devices -# Description: raw-devices -### END INIT INFO - -. /etc/rc.status - -CONFIG=/etc/raw -RAW_BIN=/sbin/raw -RAW_MODULE=raw -test -x $RAW_BIN || exit 5 - -if [ ! -f $CONFIG ];then - echo "file: $CONFIG not found" - exit 6 -fi - -rc_reset -case "$1" in - start) - /sbin/modprobe $RAW_MODULE && sleep 2 - line=`grep -v ^# < $CONFIG` - - for i in $line;do - rawdev=`echo $i | cut -f1 -d:` - rawbind=`echo $i | cut -f2- -d:` - echo -n "bind /dev/raw/$rawdev to /dev/$rawbind..." - $RAW_BIN /dev/raw/$rawdev /dev/$rawbind > /dev/null 2>&1 - rc_status -v - done - ;; - stop) - echo -n "to unbind the rawdevice please perform a system shutdown" - rc_failed 3 - rc_status -v - ;; - status) - $RAW_BIN -qa 2> /dev/null - rc_status -v - ;; - *) - echo "Usage: $0 {start|stop|status}" - exit 1 - ;; -esac -rc_exit diff --git a/raw.service b/raw.service new file mode 100644 index 0000000..37d53b3 --- /dev/null +++ b/raw.service @@ -0,0 +1,17 @@ +[Unit] +Description=raw devices +After=local-fs.target remote-fs.target + +[Service] +Type=oneshot +ExecStart=/bin/sh -c "\ + /sbin/modprobe raw;\ + /sbin/udevadm settle;\ + for i in `grep -v ^# /etc/raw`; do\ + rawdev=`echo $i | cut -f1 -d:`;\ + rawbind=`echo $i | cut -f2- -d:`;\ + /usr/sbin/raw /dev/raw/$rawdev /dev/$rawbind;\ + done" + +[Install] +WantedBy=multi-user.target diff --git a/util-linux-2.29.1.tar.sign b/util-linux-2.29.1.tar.sign new file mode 100644 index 0000000..ee6ab49 --- /dev/null +++ b/util-linux-2.29.1.tar.sign @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQIcBAABCAAGBQJYghWjAAoJEOS3HV7sOcKEsRsP/Rhl+vlB9TQmxHF4EhglTJMv +i8x65Eq4WznF+qf9ZMZ4qSrsfS/FqvIccw9MWEywj3lAHBx05jhW5Bx6vEzFijiS +CuzRcx+5UuO6DQHxySIRqxromCRaCNzUnNhZfFVlJo1EAD1TVzuF62otCRHxE6F+ +NMjw9+PAPrYT00L6I3AzIHc7t+EgZX6Cyr2Yb22VQnTIJc8E7XfiA7iXgjdhqsn9 +kKUl4kUDGZULX9cIjRkbaVIR7Z8+DH0LcA7QyvA+Xw3fu4UGVCRHR5EquUWEplQD +1rycHxEjRvOjheZCHdAUlhzHguNm2xVSTtcLjvMieMOM60pNxijLibhKkMmqkjJX +e/CLWFHPLnxpJ+WPRUAA5qVrpRjkUm3Wh5O/TBytICQUPTRw7wG4WPgOtgpq3aSr +aet8iClLZkAw7wNS3O+VTRZuzB+mfbguRR7S2o0UemmEBJ9Y4nkaZN/SyT/aX4t0 +vhvM3tbIgw3sGozEsYMjzO/iQTDRIi284DVnfPS7Y1A2RY5lDkSzKowiL9X1vh61 +5tapPthH4Fmss+sd/mC6W3XiBRvLR32l6gTq1M4kMPVKZ3XPlo2uvNbTiL93nI1q +DDWSzORi+bSsjMGUYU3VDlzqnsrhwxzdCNl6eA+/Y65tRwQNmOPpBVkSOfp+Fqy9 +R6VzZW/Y6fWxPojd34A2 +=OXAT +-----END PGP SIGNATURE----- diff --git a/util-linux-2.29.1.tar.xz b/util-linux-2.29.1.tar.xz new file mode 100644 index 0000000..09ad2cd --- /dev/null +++ b/util-linux-2.29.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ce40600b934ec2fecfa6bfc4efe6982d051ba96c2832b05201347aec582f54f +size 4278756 diff --git a/util-linux-2.29.tar.sign b/util-linux-2.29.tar.sign deleted file mode 100644 index b17a572..0000000 --- a/util-linux-2.29.tar.sign +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQIcBAABCAAGBQJYIa+yAAoJEOS3HV7sOcKEkPEQAJ6qcx836hUP93e+q8lH7Anf -6odYlxYWC5Pgb8Qopn1KDMh5c3GAbPrnbSoVRKS3jvc24uZuhlCCwYnJbcmEt/+L -am+/zQyIF9T5ZwTadnGD2bkYXI5N9eS4R5O0N/OdBTgsVr9rjZ318zHg+8YCUZN0 -hCh4e1UlUC8uL7C/WgeLW/+kN+D+/1KJISDerkw+u5FFPZGWcPcYPh7ofi4ZyV/h -OPgvaEHt3/IxsZnuUNtIEVhFBpabjdwLkXm1LQ26XLnkdipBuuadVB8jaSLUz29J -rkNVI0iiH9vq5abE0wDIzQ2Lt4Lv65fQM7dmw/Ek188tZn9MyX8vT+C5Vyu+EFtU -K+1BwMVNqfW5hZHPM2z7izO/ml77wnydEFGy9GZZpLqQAzUGgsQDC3JbiczC7Qfq -bTFGhz32sHp/2gyOqciwhLPzWxD6jOLVG84vC9Obvtm+xQEfvLa71FnHdcLU3uZA -uZHt50WSuusZJtCWDhhLgfV6NV7c+YB1tELfrStlXAHyZT3Ws0pNPv+5Sue81dGt -uYVOOlXd+5qVpcgJRs5ai86yzv65kCeqmDsSAiHMIwPfFYBOeYessiRmWpqJXTt2 -S38j00fHFbNh5qqgDyso6myan4ZNLVIpihZLT2JLJqxEnf4ILZVV7krNW9p09teq -afEkNizqGL/NF2I7ltpe -=5e/s ------END PGP SIGNATURE----- diff --git a/util-linux-2.29.tar.xz b/util-linux-2.29.tar.xz deleted file mode 100644 index 1107cb6..0000000 --- a/util-linux-2.29.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2c59ea67cc7b564104f60532f6e0a95fe17a91acb870ba8fd7e986f273abf9e7 -size 4249020 diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes index ea48eb4..967a5df 100644 --- a/util-linux-systemd.changes +++ b/util-linux-systemd.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Feb 7 20:07:55 CET 2017 - sbrabec@suse.com + +- Update to version 2.29.1: + * lscpu: add aarch64 specific names + * lubmount: Disable disable ro/rw mtab checks (bsc#1012632) + * More details at: + https://www.kernel.org/pub/linux/utils/util-linux/v2.29/v2.29.1-ReleaseNotes + +------------------------------------------------------------------- +Tue Feb 7 18:31:04 CET 2017 - sbrabec@suse.com + +- Replace raw initscript by a systemd service doing the same thing. + Based on previous work of fcrozat@suse.com (FATE#321122). + ------------------------------------------------------------------- Thu Jan 5 12:34:33 UTC 2017 - sweet_f_a@gmx.de diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec index baa5501..b7ced87 100644 --- a/util-linux-systemd.spec +++ b/util-linux-systemd.spec @@ -112,7 +112,7 @@ BuildRequires: libmount-devel %endif %endif #END SECOND STAGE DEPENDENCIES -Version: 2.29 +Version: 2.29.1 Release: 0 # util-linux is a base package and uuidd pre-requiring pwdutils pulls # that into the core build cycle. pwdutils also pulls in the whole @@ -123,7 +123,7 @@ Release: 0 Url: https://www.kernel.org/pub/linux/utils/util-linux/ Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.29/%{_name}-%{version}.tar.xz Source1: util-linux-rpmlintrc -Source4: raw.init +Source4: raw.service Source5: etc.raw Source6: etc_filesystems Source7: baselibs.conf @@ -159,7 +159,6 @@ Provides: fsck-with-dev-lock = %{version} # bnc#651598: Provides: util-linux(fake+no-canonicalize) PreReq: %install_info_prereq permissions -PreReq: %insserv_prereq %fillup_prereq /bin/sed Recommends: %{name}-lang = %{version} Provides: eject = 2.1.0-166.8 Provides: login = 4.0-33.7 @@ -599,7 +598,7 @@ exit "$result" %install %if %build_util_linux -mkdir -p %{buildroot}{%{_sysconfdir}/{init.d,pam.d,default},%{_mandir}/man{1,8},/bin,/sbin,%{_bindir},%{_sbindir},%{_infodir}} +mkdir -p %{buildroot}{%{_sysconfdir}/{pam.d,default},%{_mandir}/man{1,8},/bin,/sbin,%{_bindir},%{_sbindir},%{_infodir}} install -m 644 %{SOURCE51} %{buildroot}%{_sysconfdir}/blkid.conf install -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/pam.d/login install -m 644 %{SOURCE9} %{buildroot}%{_sysconfdir}/pam.d/remote @@ -608,7 +607,6 @@ install -m 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/pam.d/runuser-l install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su-l install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/default/su -mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates pushd ../klogconsole # klogconsole install make install DEST=%{buildroot} @@ -672,8 +670,8 @@ echo -e "#! /bin/bash\n/sbin/blockdev --flushbufs \$1" > %{buildroot}%{_sbindir} chmod 755 %{buildroot}%{_sbindir}/flushb # Install scripts to configure raw devices at boot time install -m 644 $RPM_SOURCE_DIR%{_sysconfdir}.raw %{buildroot}%{_sysconfdir}/raw -install -m 755 $RPM_SOURCE_DIR/raw.init %{buildroot}%{_initddir}/raw -ln -sf ../..%{_sysconfdir}/init.d/raw %{buildroot}%{_sbindir}/rcraw +install -m 644 $RPM_SOURCE_DIR/raw.service %{buildroot}%{_unitdir} +ln -sf service %{buildroot}%{_sbindir}/rcraw # upstream moved getopt examples from datadir to docdir but we keep # the old location because we would need to fix the manpage first mv %{buildroot}%{_docdir}/%{_name}/getopt %{buildroot}%{_datadir}/ @@ -748,8 +746,11 @@ echo -e 'enable uuidd.socket\nenable uuidd.service' >%{buildroot}/usr/lib/system %fdupes -s %{buildroot}%{_prefix} %if %build_util_linux +%pre +%{service_add_pre raw.service} + %post -%{fillup_and_insserv raw} +%{service_add_post raw.service} %set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount %set_permissions %{_bindir}/su # Safely migrate PAM files from coreutils to util-linux @@ -775,8 +776,11 @@ if [ -f etc/fstab ]; then sed -i 's:code=:codepage=:' etc/fstab fi +%preun +%{service_del_preun raw.service} + %postun -%{insserv_cleanup} +%{service_del_postun raw.service} %verifyscript %verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount @@ -860,7 +864,7 @@ fi %doc Documentation/modems-with-agetty.txt %doc Documentation/mount.txt %doc Documentation/pg.txt -%config %attr(744,root,root) %{_sysconfdir}/init.d/raw +%{_unitdir}/raw.service %config(noreplace) %attr(644,root,root) %{_sysconfdir}/raw %config(noreplace) %{_sysconfdir}/filesystems %config(noreplace) %{_sysconfdir}/blkid.conf diff --git a/util-linux.changes b/util-linux.changes index ea48eb4..967a5df 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Feb 7 20:07:55 CET 2017 - sbrabec@suse.com + +- Update to version 2.29.1: + * lscpu: add aarch64 specific names + * lubmount: Disable disable ro/rw mtab checks (bsc#1012632) + * More details at: + https://www.kernel.org/pub/linux/utils/util-linux/v2.29/v2.29.1-ReleaseNotes + +------------------------------------------------------------------- +Tue Feb 7 18:31:04 CET 2017 - sbrabec@suse.com + +- Replace raw initscript by a systemd service doing the same thing. + Based on previous work of fcrozat@suse.com (FATE#321122). + ------------------------------------------------------------------- Thu Jan 5 12:34:33 UTC 2017 - sweet_f_a@gmx.de diff --git a/util-linux.spec b/util-linux.spec index 97b4276..db5a9a6 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -112,7 +112,7 @@ BuildRequires: libmount-devel %endif %endif #END SECOND STAGE DEPENDENCIES -Version: 2.29 +Version: 2.29.1 Release: 0 # util-linux is a base package and uuidd pre-requiring pwdutils pulls # that into the core build cycle. pwdutils also pulls in the whole @@ -123,7 +123,7 @@ Release: 0 Url: https://www.kernel.org/pub/linux/utils/util-linux/ Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.29/%{_name}-%{version}.tar.xz Source1: util-linux-rpmlintrc -Source4: raw.init +Source4: raw.service Source5: etc.raw Source6: etc_filesystems Source7: baselibs.conf @@ -159,7 +159,6 @@ Provides: fsck-with-dev-lock = %{version} # bnc#651598: Provides: util-linux(fake+no-canonicalize) PreReq: %install_info_prereq permissions -PreReq: %insserv_prereq %fillup_prereq /bin/sed Recommends: %{name}-lang = %{version} Provides: eject = 2.1.0-166.8 Provides: login = 4.0-33.7 @@ -599,7 +598,7 @@ exit "$result" %install %if %build_util_linux -mkdir -p %{buildroot}{%{_sysconfdir}/{init.d,pam.d,default},%{_mandir}/man{1,8},/bin,/sbin,%{_bindir},%{_sbindir},%{_infodir}} +mkdir -p %{buildroot}{%{_sysconfdir}/{pam.d,default},%{_mandir}/man{1,8},/bin,/sbin,%{_bindir},%{_sbindir},%{_infodir}} install -m 644 %{SOURCE51} %{buildroot}%{_sysconfdir}/blkid.conf install -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/pam.d/login install -m 644 %{SOURCE9} %{buildroot}%{_sysconfdir}/pam.d/remote @@ -608,7 +607,6 @@ install -m 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/pam.d/runuser-l install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su-l install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/default/su -mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates pushd ../klogconsole # klogconsole install make install DEST=%{buildroot} @@ -672,8 +670,8 @@ echo -e "#! /bin/bash\n/sbin/blockdev --flushbufs \$1" > %{buildroot}%{_sbindir} chmod 755 %{buildroot}%{_sbindir}/flushb # Install scripts to configure raw devices at boot time install -m 644 $RPM_SOURCE_DIR%{_sysconfdir}.raw %{buildroot}%{_sysconfdir}/raw -install -m 755 $RPM_SOURCE_DIR/raw.init %{buildroot}%{_initddir}/raw -ln -sf ../..%{_sysconfdir}/init.d/raw %{buildroot}%{_sbindir}/rcraw +install -m 644 $RPM_SOURCE_DIR/raw.service %{buildroot}%{_unitdir} +ln -sf service %{buildroot}%{_sbindir}/rcraw # upstream moved getopt examples from datadir to docdir but we keep # the old location because we would need to fix the manpage first mv %{buildroot}%{_docdir}/%{_name}/getopt %{buildroot}%{_datadir}/ @@ -748,8 +746,11 @@ echo -e 'enable uuidd.socket\nenable uuidd.service' >%{buildroot}/usr/lib/system %fdupes -s %{buildroot}%{_prefix} %if %build_util_linux +%pre +%{service_add_pre raw.service} + %post -%{fillup_and_insserv raw} +%{service_add_post raw.service} %set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount %set_permissions %{_bindir}/su # Safely migrate PAM files from coreutils to util-linux @@ -775,8 +776,11 @@ if [ -f etc/fstab ]; then sed -i 's:code=:codepage=:' etc/fstab fi +%preun +%{service_del_preun raw.service} + %postun -%{insserv_cleanup} +%{service_del_postun raw.service} %verifyscript %verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount @@ -860,7 +864,7 @@ fi %doc Documentation/modems-with-agetty.txt %doc Documentation/mount.txt %doc Documentation/pg.txt -%config %attr(744,root,root) %{_sysconfdir}/init.d/raw +%{_unitdir}/raw.service %config(noreplace) %attr(644,root,root) %{_sysconfdir}/raw %config(noreplace) %{_sysconfdir}/filesystems %config(noreplace) %{_sysconfdir}/blkid.conf