diff --git a/app-misc/sabayonlive-tools/Manifest b/app-misc/sabayonlive-tools/Manifest
index d951a2f39..69852d99a 100644
--- a/app-misc/sabayonlive-tools/Manifest
+++ b/app-misc/sabayonlive-tools/Manifest
@@ -6,7 +6,7 @@ AUX 2.1.2/livespawn 193 RMD160 44ff80224d903d3ca08dfca0dafd9443f4282f24 SHA1 306
 AUX 2.1.2/logscript.sh 3554 RMD160 6e044507b919a6ebad8795dafb9307a95eebae03 SHA1 20bd627eaf803dd31c90c94510d639919df59344 SHA256 64cf1c3a480f2677c9f2742bd0a476ddda796c0106724dce1f09c6ed004e5d72
 AUX 2.1.2/net-setup 1529 RMD160 1a0f42dd2ef4b2c94d40bc2b94176c9d2a15d2f7 SHA1 b11d433afba664770e6c99c681f8c99d8c71230e SHA256 41f5fdf35752837e69e958b7082339146c2c8e2e3470add2cd2eab4092d50d9a
 AUX 2.1.2/opengl-activator 10039 RMD160 5259240fa99173901530a8d6ed1fc20cbeb8db4d SHA1 80b9e8b4536d3f1cf29dc890a908f23980907319 SHA256 0090240f1c8cba0d9dae59dac4b472e4b73fc41e64cb178e786d1093af565eaf
-AUX 2.1.2/sabayon-functions.sh 2066 RMD160 4997fe2ecfc3f91fc76274bebced3fb3e70918d2 SHA1 f52f09d2858481da34a1d6baf11bb730f7b6091a SHA256 3db623c1d2347ebb4fc41470a2fb2ff4720e91fe79baf24372f125bda04dfe81
+AUX 2.1.2/sabayon-functions.sh 2082 RMD160 852f4c314ae5d7c9433146420e509dd409eb5421 SHA1 37f381e0e1cd27d45d868ddea2611e022e810199 SHA256 5afe67d02f29d9fb726a480cc74617a6b1ee91060e842cc3416ea96b72c7a6dd
 AUX 2.1.2/sabayon-live-check 1049 RMD160 cad4c414558a297332409fc807e5be1c0ace6e97 SHA1 65795c09bfc01e28e1d27778ff2e50d1928cb016 SHA256 ca4d2f7b734970df90b651e41b580dfb23a9a04d3c89309fee2b4a6541081b5a
 AUX 2.1.2/sabayonlive 12181 RMD160 ea18bc86dff48dbbe19d7c969056d9f6d70a6ce6 SHA1 886b42083edc4db6e027dd257bf8f3dab62dda49 SHA256 cc01397885837163a974baf1a050f8fd67d554834882638482b4ca1bb550a237
 AUX 2.1.2/sabutil 13668 RMD160 2152a4300c2d5d3757dfdcc97a2b747571a7e84f SHA1 9ab949df6477e2a451844d7f9108081f85811e5b SHA256 274306878dd4a96e8e3f908c73a2bdde7553b42d8a13ae51f39a22e5c092907f
@@ -14,4 +14,4 @@ AUX 2.1.2/vga-cmd-parser 1382 RMD160 75a4ba47833ec376fa91938c9553e68c058629da SH
 AUX 2.1.2/x-setup-configuration 6724 RMD160 9a24a9257f743fa63a2f208aed291a37fa9ea1da SHA1 b95ac8e979790c7c07f242679dd5ba309746a86f SHA256 ca9d2a6fb2e7a06834e01397f42282d6bfa7ce0a46484cf5e5743e8b81818aa1
 AUX 2.1.2/x-setup-init.d 1246 RMD160 61f29d2f88d2c2bcc3cc8a3c80cf7807d01b1a47 SHA1 29ed0308d1ad6888589014cdf4e7772c145de3a7 SHA256 1b7ea99b27ec09e51a45207d275a2317b4ba06be1334ae17c27140a02a0762dd
 AUX 2.1.2/xorg.conf.sabayon 2194 RMD160 2fe1b4f00d479f9de294e696c0c90535ee6fe3f0 SHA1 b4286c8391e8090220608dc48b068315b1701aef SHA256 f303a9f2ad64b71c5707548437fed3f556cb25617624891c8b71899988a7d22d
-EBUILD sabayonlive-tools-2.1.2-r1.ebuild 1493 RMD160 f1222604724f036e4ce2ff3816b919a768d98443 SHA1 cea56ca4013c92024fdc85abb9d5e005eb7d1acc SHA256 5462ae74af393b5fa6da3775a2d5bcb7737c5e3daa022afc4739d3bd35eb179e
+EBUILD sabayonlive-tools-2.1.2-r2.ebuild 1493 RMD160 f1222604724f036e4ce2ff3816b919a768d98443 SHA1 cea56ca4013c92024fdc85abb9d5e005eb7d1acc SHA256 5462ae74af393b5fa6da3775a2d5bcb7737c5e3daa022afc4739d3bd35eb179e
diff --git a/app-misc/sabayonlive-tools/files/2.1.2/sabayon-functions.sh b/app-misc/sabayonlive-tools/files/2.1.2/sabayon-functions.sh
index b10ed04aa..ab99f7af9 100644
--- a/app-misc/sabayonlive-tools/files/2.1.2/sabayon-functions.sh
+++ b/app-misc/sabayonlive-tools/files/2.1.2/sabayon-functions.sh
@@ -68,5 +68,5 @@ sabayon_setup_vt_autologin() {
 }
 
 sabayon_setup_oem_livecd() {
-	[[ -x "${oem_file}" ]] && ${oem_file}
+	( [[ -x "${oem_file}" ]] && ${oem_file} ) || return 0
 }
diff --git a/app-misc/sabayonlive-tools/sabayonlive-tools-2.1.2-r1.ebuild b/app-misc/sabayonlive-tools/sabayonlive-tools-2.1.2-r2.ebuild
similarity index 100%
rename from app-misc/sabayonlive-tools/sabayonlive-tools-2.1.2-r1.ebuild
rename to app-misc/sabayonlive-tools/sabayonlive-tools-2.1.2-r2.ebuild