From ad502ef188ed193fa66e704e0166aade08d71581 Mon Sep 17 00:00:00 2001 From: Zamentur aka ljf Date: Sat, 26 Sep 2015 23:27:23 +0200 Subject: [PATCH] [fix] Remove completely the set_domain to allow DockerFile creation The hostname is change in post installation --- install_yunohostv2 | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/install_yunohostv2 b/install_yunohostv2 index 4e5752b..bb2a4e4 100755 --- a/install_yunohostv2 +++ b/install_yunohostv2 @@ -128,14 +128,6 @@ EOF fi } -set_domain() { - # Configure hostname to yunohost.yunohost.org if not already set - # NOTE: This is done also during postinstall "to avoid amavis bug" - # so we might not need it here - [[ "$(hostname -d 2>/dev/null)" != "" ]] || hostname yunohost.yunohost.org \ - || echo 'Hostname change is not permitted' > /dev/null 2>&1 -} - confirm_installation() { [[ "$AUTOMODE" == "1" ]] && return 0 @@ -390,40 +382,36 @@ if ! step create_custom_config ; then die "Creating custom configuration file /etc/yunohost/yunohost.conf failed" 4 fi -if ! step set_domain ; then - die "Setting hostname failed" 5 -fi - if ! step confirm_installation ; then - die "Installation cancelled at your request" 6 + die "Installation cancelled at your request" 5 fi if ! step setup_package_source ; then - die "Setting up deb package sources failed" 7 + die "Setting up deb package sources failed" 6 fi if ! step apt_update ; then - die "Error caught during 'apt-get update'" 8 + die "Error caught during 'apt-get update'" 7 fi if ! step register_debconf ; then - die "Unable to insert new values into debconf database" 9 + die "Unable to insert new values into debconf database" 8 fi if ! step workaround_avahi_installation ; then - die "Unable to install workaround for avahi installation" 10 + die "Unable to install workaround for avahi installation" 9 fi if ! step install_yunohost_packages ; then - die "Installation of Yunohost packages failed" 11 + die "Installation of Yunohost packages failed" 10 fi if ! step restart_services ; then - die "Error caught during services restart" 12 + die "Error caught during services restart" 11 fi if ! step post_install ; then - die "Post-installation failed" 13 + die "Post-installation failed" 12 fi # Success !