From ee95e2de6dbead5cb437d7f7f18e543abec2fcf8 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Thu, 4 Nov 2010 20:09:34 +0100 Subject: [PATCH] [app-misc/sabayonlive-tools] move (keeping backward compat) oem execution script to /etc/oem --- app-misc/sabayonlive-tools/Manifest | 2 +- app-misc/sabayonlive-tools/files/2.2/sabayon-functions.sh | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app-misc/sabayonlive-tools/Manifest b/app-misc/sabayonlive-tools/Manifest index 5c11be004..fca8500b1 100644 --- a/app-misc/sabayonlive-tools/Manifest +++ b/app-misc/sabayonlive-tools/Manifest @@ -7,7 +7,7 @@ AUX 2.2/livespawn 193 RMD160 44ff80224d903d3ca08dfca0dafd9443f4282f24 SHA1 30654 AUX 2.2/logscript.sh 3554 RMD160 6e044507b919a6ebad8795dafb9307a95eebae03 SHA1 20bd627eaf803dd31c90c94510d639919df59344 SHA256 64cf1c3a480f2677c9f2742bd0a476ddda796c0106724dce1f09c6ed004e5d72 AUX 2.2/net-setup 1529 RMD160 1a0f42dd2ef4b2c94d40bc2b94176c9d2a15d2f7 SHA1 b11d433afba664770e6c99c681f8c99d8c71230e SHA256 41f5fdf35752837e69e958b7082339146c2c8e2e3470add2cd2eab4092d50d9a AUX 2.2/opengl-activator 10039 RMD160 5259240fa99173901530a8d6ed1fc20cbeb8db4d SHA1 80b9e8b4536d3f1cf29dc890a908f23980907319 SHA256 0090240f1c8cba0d9dae59dac4b472e4b73fc41e64cb178e786d1093af565eaf -AUX 2.2/sabayon-functions.sh 3281 RMD160 a243cd3fbe22848968300f2b65eff06261754162 SHA1 43742a3aa16c812ad288fe44707390896855d54c SHA256 9b3a6105d1d94927879825bdb3ee745d40e53be32213715740c94f88446b8db9 +AUX 2.2/sabayon-functions.sh 3400 RMD160 93d0be6c79fbfae828e0278bfae9af0b85b795bb SHA1 fdfd0dbbbdd715b678cb0f664ab30d88d33fc584 SHA256 c59b15e7bb54cf559cb862f4377d68130fd60ad6d75a6f3eb2d5376884366f69 AUX 2.2/sabayon-live-check 1049 RMD160 cad4c414558a297332409fc807e5be1c0ace6e97 SHA1 65795c09bfc01e28e1d27778ff2e50d1928cb016 SHA256 ca4d2f7b734970df90b651e41b580dfb23a9a04d3c89309fee2b4a6541081b5a AUX 2.2/sabayon-welcome-loader 291 RMD160 ddc6ff805322b63a17495e641ff4d6484e598227 SHA1 d2ccba8580abab1c0cb436a8589360ce78df6545 SHA256 4e4769a0cb0ad3f48f561b0eb82b05214da9d640da170a9c7cd3531051622ca6 AUX 2.2/sabayon-welcome-loader.desktop 162 RMD160 4fe1c8c6b26196d9671b4e683e4cf73fad87fc9f SHA1 8b09704511035ae21a32b8b735040530b6437de9 SHA256 37cc2ff95764baa148a68f6669be56bd9d6fa6bc805242dcfa8e0fd8d49a44d0 diff --git a/app-misc/sabayonlive-tools/files/2.2/sabayon-functions.sh b/app-misc/sabayonlive-tools/files/2.2/sabayon-functions.sh index b76f8ecb8..2a0d9267e 100644 --- a/app-misc/sabayonlive-tools/files/2.2/sabayon-functions.sh +++ b/app-misc/sabayonlive-tools/files/2.2/sabayon-functions.sh @@ -4,6 +4,7 @@ GDM_FILE="/usr/share/gdm/defaults.conf" KDM_FILE="/usr/share/config/kdm/kdmrc" LXDM_FILE="/etc/lxdm/lxdm.conf" OEM_FILE="/etc/oemlive.sh" +OEM_FILE_NEW="/etc/oem/liveboot.sh" LIVE_USER_GROUPS="audio cdrom cdrw clamav console disk entropy games haldaemon \ kvm lp lpadmin messagebus plugdev polkituser portage pulse pulse-access pulse-rt \ scanner usb users uucp vboxguest vboxusers video wheel" @@ -109,5 +110,10 @@ sabayon_setup_vt_autologin() { } sabayon_setup_oem_livecd() { - ( [[ -x "${OEM_FILE}" ]] && ${OEM_FILE} ) || return 0 + if [ -x "${OEM_LIVE_NEW}" ]; then + ${OEM_FILE_NEW} || return 1 + elif [ -x "${OEM_LIVE}" ]; then + ${OEM_FILE} || return 1 + fi + return 0 }