diff --git a/share/etc/init.d/one.debian b/share/etc/init.d/one.debian index 531f8b03ae..7b75fffcaf 100755 --- a/share/etc/init.d/one.debian +++ b/share/etc/init.d/one.debian @@ -36,12 +36,7 @@ do_start() { mkdir -p /var/run/one /var/lock/one chown oneadmin /var/run/one /var/lock/one - ONE_AUTH_FILE=/var/lib/one/auth - if [ ! -f $ONE_AUTH_FILE ]; then - PASSWORD=$(cat /dev/urandom|tr -dc 'a-zA-Z0-9'|fold -w 10|head -n1) - su oneadmin -s /bin/sh -c "echo oneadmin:$PASSWORD > $ONE_AUTH_FILE" - fi - ONE_AUTH=$ONE_AUTH_FILE su oneadmin -s /bin/sh -c 'one start' + su oneadmin -s /bin/sh -c 'one start' } # diff --git a/share/etc/init.d/one.ubuntu b/share/etc/init.d/one.ubuntu index 531f8b03ae..7b75fffcaf 100755 --- a/share/etc/init.d/one.ubuntu +++ b/share/etc/init.d/one.ubuntu @@ -36,12 +36,7 @@ do_start() { mkdir -p /var/run/one /var/lock/one chown oneadmin /var/run/one /var/lock/one - ONE_AUTH_FILE=/var/lib/one/auth - if [ ! -f $ONE_AUTH_FILE ]; then - PASSWORD=$(cat /dev/urandom|tr -dc 'a-zA-Z0-9'|fold -w 10|head -n1) - su oneadmin -s /bin/sh -c "echo oneadmin:$PASSWORD > $ONE_AUTH_FILE" - fi - ONE_AUTH=$ONE_AUTH_FILE su oneadmin -s /bin/sh -c 'one start' + su oneadmin -s /bin/sh -c 'one start' } # diff --git a/share/etc/init.d/oned.centos b/share/etc/init.d/oned.centos index 61ed5d65f1..1eae735472 100755 --- a/share/etc/init.d/oned.centos +++ b/share/etc/init.d/oned.centos @@ -34,19 +34,9 @@ check() { } start() { - check - - ONE_AUTH_FILE=/var/lib/one/auth - if [ ! -f $ONE_AUTH_FILE ]; then - PASSWORD=$(cat /dev/urandom|tr -dc 'a-zA-Z0-9'|fold -w 10|head -n1) - su oneadmin -s /bin/sh -c "echo oneadmin:$PASSWORD > $ONE_AUTH_FILE" - fi - echo -n $"Starting OpenNebula daemon: " - - - daemon --user oneadmin ONE_AUTH=$ONE_AUTH_FILE $ONE_BIN start + daemon --user oneadmin $ONE_BIN start RETVAL=$? echo return $RETVAL diff --git a/share/etc/init.d/oned.opensuse b/share/etc/init.d/oned.opensuse index 40724aa892..071688e56d 100755 --- a/share/etc/init.d/oned.opensuse +++ b/share/etc/init.d/oned.opensuse @@ -34,14 +34,8 @@ rc_reset case "$1" in start) - ONE_AUTH_FILE=/var/lib/one/auth - if [ ! -f $ONE_AUTH_FILE ]; then - PASSWORD=$(cat /dev/urandom|tr -dc 'a-zA-Z0-9'|fold -w 10|head -n1) - su oneadmin -s /bin/sh -c "echo oneadmin:$PASSWORD > $ONE_AUTH_FILE" - fi - echo -n "Starting ONE " - ONE_AUTH=$ONE_AUTH_FILE /sbin/startproc -u oneadmin $ONE_BIN start + /sbin/startproc -u oneadmin $ONE_BIN start rc_status -v ;;