remove sshd.service since sshd package has included the service file.

This also fixes a problem with system-plugin-emulator and openssh. Currently
They conflict, because both provide sshd.service for systemd. But the service
file from this package is broken. It just runs /etc/init.d/ssh, but without
openssh package, this file doesn't exist.

This change re-enables working sshd when system-plugin-emulator is installed.

Change-Id: Ifd3671128549b18f7f3b92b92c9bb0f3346db65b
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>

diff --git a/filesystem/usr/lib/systemd/system/sshd.service b/filesystem/usr/lib/systemd/system/sshd.service
deleted file mode 100644 (file)
index 150ca10..0000000
--- a/filesystem/usr/lib/systemd/system/sshd.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=OpenSSH Daemon
-After=network.target
-
-[Service]
-Type=forking
-ExecStart=/etc/init.d/ssh start
-KillMode=process
-Restart=always
-
-[Install]
-WantedBy=emulator.target
-

diff --git a/packaging/system-plugin-emulator.changes b/packaging/system-plugin-emulator.changes
index f75d92c..5a2fdb6 100644 (file)
--- a/packaging/system-plugin-emulator.changes
+++ b/packaging/system-plugin-emulator.changes
@@ -1,3 +1,6 @@
+* Thu Jun 05 11:15:24 CEST 2014 Rafal Krypa <r.krypa@samsung.com>
+- remove sdbd.service since sdbd package has included the service file.
+
 * Thu Apr 17 18:03:11 KST 2014 Sooyoung Ha <yoosah.ha@samsung.com>
 - remove rc.sysinit script and modify udev rule.
 

diff --git a/packaging/system-plugin-emulator.spec b/packaging/system-plugin-emulator.spec
index 6fccdbd..9f2b47a 100644 (file)
--- a/packaging/system-plugin-emulator.spec
+++ b/packaging/system-plugin-emulator.spec
@@ -34,7 +34,6 @@ if [ ! -d %{buildroot}/etc/rc.d/rc3.d ]; then
 fi
 ln -s /etc/init.d/setup-audio-volume %{buildroot}//etc/rc.d/rc3.d/S02setup-audio-volume
 ln -s /etc/init.d/mount-hostdir %{buildroot}//etc/rc.d/rc3.d/S03mount-hostdir
-ln -s /etc/init.d/ssh %{buildroot}/etc/rc.d/rc3.d/S50ssh
 
 # for systemd
 # for emulator_preinit.target
@@ -48,7 +47,6 @@ ln -s %{systemd_dir}/system/emul-common-preinit.service %{buildroot}/%{systemd_d
 mkdir -p %{buildroot}/%{systemd_dir}/system/multi-user.target.wants
 ln -s %{systemd_dir}/system/emulator.target %{buildroot}/%{systemd_dir}/system/multi-user.target.wants/
 mkdir -p %{buildroot}/%{systemd_dir}/system/emulator.target.wants
-ln -s %{systemd_dir}/system/sshd.service %{buildroot}/%{systemd_dir}/system/emulator.target.wants/
 
 # for host file sharing
 mkdir -p %{buildroot}/mnt/host
@@ -81,7 +79,6 @@ fi
 /etc/rc.d/rc.sysinit
 /etc/rc.d/rc3.d/S02setup-audio-volume
 /etc/rc.d/rc3.d/S03mount-hostdir
-/etc/rc.d/rc3.d/S50ssh
 /usr/lib/systemd/system/emulator_preinit.target
 /usr/lib/systemd/system/emulator.target
 /usr/lib/systemd/system/basic.target.wants/emulator_preinit.target
@@ -92,8 +89,6 @@ fi
 /usr/lib/systemd/system/emulator_preinit.target.wants/emul-setup-audio-volume.service
 /usr/lib/systemd/system/emulator_preinit.target.wants/emul-mount-hostdir.service
 /usr/lib/systemd/system/emulator_preinit.target.wants/emul-common-preinit.service
-/usr/lib/systemd/system/sshd.service
-/usr/lib/systemd/system/emulator.target.wants/sshd.service
 /usr/lib/udev/rules.d/95-tizen-emulator.rules
 %dir /mnt/host
 /usr/share/license/%{name}