Merge branch 'tizen_3.0' into tizen

Conflicts:
	packaging/system-plugin.spec

Change-Id: Ibf39413dac46328dd387e296191272e8cfe0e472

diff --cc packaging/system-plugin.spec
index d65ac9e,06a1e97..8cfaef4
--- 1/packaging/system-plugin.spec
--- 2/packaging/system-plugin.spec
+++ b/packaging/system-plugin.spec
@@@ -197,21 -181,17 +197,28 @@@ install -m 755 scripts/tizen-fstrim-on-
  mkdir -p %{buildroot}%{_datadir}
  cp -r upgrade %{buildroot}%{_datadir}
  mkdir -p %{buildroot}%{_unitdir}/system-update.target.wants
+ install -m 644 units/init-update.service %{buildroot}%{_unitdir}
  install -m 644 units/offline-update.service %{buildroot}%{_unitdir}
- ln -s ../offline-update.service %{buildroot}%{_unitdir}/system-update.target.wants/offline-update.service
- ln -s %{_datadir}/upgrade %{buildroot}/system-update
+ ln -s ../init-update.service %{buildroot}%{_unitdir}/system-update.target.wants/init-update.service
+ ln -s ../getty.target %{buildroot}%{_unitdir}/system-update.target.wants
+ 
+ # ivi
+ install -m 755 scripts/usb_net_init.sh %{buildroot}%{_bindir}
+ 
+ # fixed-multi-user
+ install -m 775 -D scripts/fixed-multi-user.sh %{buildroot}%{_datadir}/fixed_multiuser/fixed-multi-user.sh
  
 +# init_wrapper
 +mkdir -p %{buildroot}%{_sbindir}
 +install -m 755 scripts/init.wrapper %{buildroot}%{_sbindir}
 +
 +# headless
 +mkdir -p %{buildroot}%{_sbindir}
 +install -m 755 scripts/sdb-mode.sh %{buildroot}%{_bindir}
 +mkdir -p %{buildroot}%{_prefix}/lib/udev/rules.d/
 +install -m 644 rules/99-sdb-switch.rules %{buildroot}%{_prefix}/lib/udev/rules.d/
 +mkdir -p %{buildroot}%{_sysconfdir}/profile.d
 +install -m 755 scripts/headless_env.sh %{buildroot}%{_sysconfdir}/profile.d
  %clean
  rm -rf %{buildroot}
  
@@@ -329,27 -312,17 +339,31 @@@ mv %{_sysconfdir}/fstab_lazymnt %{_sysc
  %manifest systemd-user-helper.manifest
  %caps(cap_sys_admin,cap_mac_admin,cap_mac_override,cap_dac_override,cap_setgid=ei) %{_bindir}/systemd_user_helper
  
+ #TODO: when uninstalling, it should be restored to original file
  %posttrans -n systemd-user-helper
  cp -a /usr/lib/systemd/system/user\@.service /usr/lib/systemd/system/__user@.service
- /usr/bin/sed -i -e 's/Type=\(.*\)/Type=simple/' /usr/lib/systemd/system/user\@.service
- /usr/bin/sed -i -e 's/ExecStart=\(.*\)/ExecStart=\/usr\/bin\/systemd_user_helper %i/' /usr/lib/systemd/system/user\@.service
- /usr/bin/sed -i -e '/RemainAfterExit=\(.*\)/d' /usr/lib/systemd/system/user\@.service
- echo 'RemainAfterExit=yes' >> /usr/lib/systemd/system/user\@.service
+ /usr/bin/sed -i -e 's/Type=\(.*\)/Type=forking/' /usr/lib/systemd/system/user\@.service
+ /usr/bin/sed -i -e 's/ExecStart=\(.*\)/ExecStart=\/usr\/bin\/systemd_user_helper start %i/' /usr/lib/systemd/system/user\@.service
+ /usr/bin/sed -i -e '/ExecStart=\(.*\)/ a ExecStop=\/usr\/bin\/systemd_user_helper stop %i' /usr/lib/systemd/system/user\@.service
+ /usr/bin/sed -i -e '/PIDFile=\(.*\)/d' /usr/lib/systemd/system/user\@.service
+ /usr/bin/sed -i -e '/XDG_RUNTIME_DIR/ a Environment=XDG_RUNTIME_EXT_DIR=/run/user_ext/%i' /usr/lib/systemd/system/user\@.service
+ echo 'PIDFile=/run/user/%i/.systemd.pid' >> /usr/lib/systemd/system/user\@.service
+ echo "d /run/user_ext 0755 root root -" >> /usr/lib/tmpfiles.d/systemd.conf
  
  %files profile_ivi
- %{_unitdir}/ivi-network.service
- %{_unitdir}/multi-user.target.wants/ivi-network.service
+ %{_prefix}/lib/udev/rules.d/99-usb-ethernet.rules
+ %{_bindir}/usb_net_init.sh
 +
 +
 +%files init_wrapper
 +%{_sbindir}/init.wrapper
 +
 +%posttrans init_wrapper
 +rm -f /sbin/init
 +ln -s /sbin/init.wrapper /sbin/init
 +
 +
 +%files headless
 +%{_bindir}/sdb-mode.sh
 +%{_prefix}/lib/udev/rules.d/99-sdb-switch.rules
 +%{_sysconfdir}/profile.d/headless_env.sh