Merge tag '10.04' into distro/mga

10.04 release

8 files changed, 97 insertions, 0 deletions

diff --git a/usr/lib/systemd/mandriva-save-dmesg b/usr/lib/systemd/mandriva-save-dmesg
new file mode 100755
index 00000000..92562fcc
--- /dev/null
+++ b/usr/lib/systemd/mandriva-save-dmesg
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+[ -f /var/log/dmesg ] && mv -f /var/log/dmesg /var/log/dmesg.old
+dmesg -s 131072 > /var/log/dmesg
diff --git a/usr/lib/systemd/system/import-state.service b/usr/lib/systemd/system/import-state.service
new file mode 100644
index 00000000..64237a09
--- /dev/null
+++ b/usr/lib/systemd/system/import-state.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=Import network configuration from initramfs
+DefaultDependencies=no
+ConditionPathIsReadWrite=/
+ConditionDirectoryNotEmpty=/run/initramfs/state
+Conflicts=shutdown.target
+Before=shutdown.target emergency.service emergency.target systemd-tmpfiles-setup.service sysinit.target
+After=local-fs.target
+
+[Service]
+ExecStart=/usr/libexec/import-state
+Type=oneshot
+TimeoutSec=0
+RemainAfterExit=yes
+
+[Install]
+WantedBy=sysinit.target
diff --git a/usr/lib/systemd/system/loadmodules.service b/usr/lib/systemd/system/loadmodules.service
new file mode 100644
index 00000000..85e807f7
--- /dev/null
+++ b/usr/lib/systemd/system/loadmodules.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Load legacy module configuration
+DefaultDependencies=no
+Conflicts=shutdown.target
+Before=sysinit.target shutdown.target
+ConditionPathExists=|/etc/rc.modules
+ConditionDirectoryNotEmpty=|/etc/sysconfig/modules/
+
+[Service]
+ExecStart=/usr/libexec/loadmodules
+Type=oneshot
+TimeoutSec=0
+RemainAfterExit=yes
+
+[Install]
+WantedBy=sysinit.target
diff --git a/usr/lib/systemd/system/mandriva-everytime.service b/usr/lib/systemd/system/mandriva-everytime.service
new file mode 100644
index 00000000..cc247dba
--- /dev/null
+++ b/usr/lib/systemd/system/mandriva-everytime.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Reconfigure the system on administrator request
+DefaultDependencies=no
+Conflicts=shutdown.target
+Before=basic.target shutdown.target
+After=local-fs.target dkms-autorebuild.service
+
+[Service]
+ExecStart=-/etc/init.d/mandrake_everytime
+Type=oneshot
+TimeoutSec=0
+StandardInput=tty
+RemainAfterExit=yes
+
+[Install]
+WantedBy=basic.target
diff --git a/usr/lib/systemd/system/mandriva-save-dmesg.service b/usr/lib/systemd/system/mandriva-save-dmesg.service
new file mode 100644
index 00000000..386e263e
--- /dev/null
+++ b/usr/lib/systemd/system/mandriva-save-dmesg.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Save boot dmesg content
+DefaultDependencies=no
+Conflicts=shutdown.target
+After=systemd-udev-settle.service local-fs.target
+Before=shutdown.target
+
+[Service]
+ExecStart=-/lib/systemd/mandriva-save-dmesg
+Type=oneshot
+RemainAfterExit=yes
+
+[Install]
+WantedBy=shutdown.target
diff --git a/usr/lib/systemd/system/netconsole.service b/usr/lib/systemd/system/netconsole.service
new file mode 100644
index 00000000..29248a4f
--- /dev/null
+++ b/usr/lib/systemd/system/netconsole.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Initializes network console logging of kernel messages
+ConditionPathExists=/etc/sysconfig/netconsole
+After=network-online.target
+Wants=network-online.target
+
+[Service]
+ExecStart=/usr/libexec/netconsole start
+ExecStop=/usr/libexec/netconsole stop
+Type=oneshot
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/usr/lib/systemd/system/readonly-root.service b/usr/lib/systemd/system/readonly-root.service
new file mode 100644
index 00000000..26d4a118
--- /dev/null
+++ b/usr/lib/systemd/system/readonly-root.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Configure read-only root support
+DefaultDependencies=no
+Conflicts=shutdown.target
+Before=shutdown.target emergency.service emergency.target systemd-tmpfiles-setup.service local-fs.target systemd-random-seed.service
+After=systemd-remount-fs.service
+
+[Service]
+ExecStart=/usr/libexec/readonly-root
+Type=oneshot
+TimeoutSec=0
+RemainAfterExit=yes
+
+[Install]
+WantedBy=local-fs.target
diff --git a/usr/lib/udev/rules.d/60-net.rules b/usr/lib/udev/rules.d/60-net.rules
new file mode 100644
index 00000000..41875017
--- /dev/null
+++ b/usr/lib/udev/rules.d/60-net.rules
@@ -0,0 +1 @@
+ACTION=="add", SUBSYSTEM=="net", DRIVERS=="?*", ATTR{type}=="1", PROGRAM="/lib/udev/rename_device", RESULT=="?*", NAME="$result"