View | Details | Raw Unified | Return to bug 48891
Collapse All | Expand All

(-)a/base/univention-updater/script/postup.sh (-2 / +2 lines)
 Lines 38-44   die () { Link Here 
38 
	exit 1
 38 
	exit 1
39 
}
 39 
}
40 
install () {
 40 
install () {
41 
	DEBIAN_FRONTEND=noninteractive apt-get -o DPkg::Options::=--force-confold -o DPkg::Options::=--force-overwrite -o DPkg::Options::=--force-overwrite-dir -y --force-yes install "$@" >&3 2>&3
 41 
	DEBIAN_FRONTEND=noninteractive apt-get -o DPkg::Options::=--force-confold -o DPkg::Options::=--force-overwrite -o DPkg::Options::=--force-overwrite-dir -y --allow-unauthenticated --allow-downgrades --allow-remove-essential --allow-change-held-packages install "$@" >&3 2>&3
42 
}
 42 
}
43 
reinstall () {
 43 
reinstall () {
44 
	install --reinstall "$@"
 44 
	install --reinstall "$@"
 Lines 87-93   basesystem) die "The server role '$server_role' is not supported anymore with UC Link Here 
87 
esac
 87 
esac
88 

          88
          

        

        

          89
          
if ! is_ucr_true update50/skip/autoremove; then

          89
          
if ! is_ucr_true update50/skip/autoremove; then

        

          
            

              90
              
	DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes autoremove >&3 2>&3


              90
              
	DEBIAN_FRONTEND=noninteractive apt-get -y --allow-unauthenticated --allow-downgrades --allow-remove-essential --allow-change-held-packages autoremove >&3 2>&3

            

        

          91
          
fi

          91
          
fi

        

        

          92
          

          92
          

        

        

          93
          
# removes temporary sources list (always required)

          93
          
# removes temporary sources list (always required)

        



(-)a/base/univention-updater/script/preup.sh
      (-1 / +1 lines)




  

    

    

       Lines 186-192
      esac 
    
  Link Here 
    

  

        

          186
          

          186
          

        

        

          187
          
# autoremove before the update

          187
          
# autoremove before the update

        

        

          188
          
if ! is_ucr_true update50/skip/autoremove; then

          188
          
if ! is_ucr_true update50/skip/autoremove; then

        

          
            

              189
              
	DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes autoremove >&3 2>&3


              189
              
	DEBIAN_FRONTEND=noninteractive apt-get -y --allow-unauthenticated --allow-downgrades --allow-remove-essential --allow-change-held-packages autoremove >&3 2>&3

            

        

          190
          
fi

          190
          
fi

        

        

          191
          

          191
          

        

        

          192
          
[ -f /etc/apt/preferences.d/99ucs500.pref ] ||

          192
          
[ -f /etc/apt/preferences.d/99ucs500.pref ] ||

        



(-)a/management/univention-directory-listener/debian/tests/lxc-ucs
      (-1 / +1 lines)




  

    

    

       Lines 189-195
      install_packages() 
    
  Link Here 
    

  

        

          189
          

          189
          

        

        

          190
          
    chroot "${rootfs}" apt-get update

          190
          
    chroot "${rootfs}" apt-get update

        

        

          191
          
    if [ -n "${packages}" ]; then

          191
          
    if [ -n "${packages}" ]; then

        

          
            

              192
              
        chroot "${rootfs}" apt-get install --force-yes -y --no-install-recommends ${packages}


              192
              
        chroot "${rootfs}" apt-get install --assume-yes -y --no-install-recommends ${packages}

            

        

          193
          
    fi

          193
          
    fi

        

        

          194
          
}

          194
          
}

        

        

          195
          

          195
          

        



(-)a/test/scenarios/autotest-201-ucsschool-singleserver-s4.cfg
      (-2 / +2 lines)




  

    

    

       Lines 80-87
      command7: 
    
  Link Here 
    

  

        

          80
          
command8:

          80
          
command8:

        

        

          81
          
 . utils.sh; install_ucs_test

          81
          
 . utils.sh; install_ucs_test

        

        

          82
          
 . utils.sh; install_apps_test_packages ucsschool

          82
          
 . utils.sh; install_apps_test_packages ucsschool

        

          
            

              83
              
 univention-install -y --force-yes ucs-school-roleshares


              83
              
 univention-install -y --assume-yes ucs-school-roleshares

            

            

              84
              
 univention-install -y --force-yes ucs-school-radius-802.1x


              84
              
 univention-install -y --assume-yes ucs-school-radius-802.1x

            

        

          85
          
 . utils.sh; run_join_scripts

          85
          
 . utils.sh; run_join_scripts

        

        

          86
          
command9:

          86
          
command9:

        

        

          87
          
 # Wait for possible postruns from the run_join_scripts command

          87
          
 # Wait for possible postruns from the run_join_scripts command

        



(-)a/test/scenarios/autotest-203-ucsschool-multiserver-s4.cfg
      (-2 / +2 lines)




  

    

    

       Lines 187-194
      command6: 
    
  Link Here 
    

  

        

          187
          
command7:

          187
          
command7:

        

        

          188
          
 . utils.sh; install_ucs_test

          188
          
 . utils.sh; install_ucs_test

        

        

          189
          
 . utils.sh; install_apps_test_packages ucsschool

          189
          
 . utils.sh; install_apps_test_packages ucsschool

        

          
            

              190
              
 univention-install -y --force-yes ucs-school-roleshares


              190
              
 univention-install -y --assume-yes ucs-school-roleshares

            

            

              191
              
 univention-install -y --force-yes ucs-school-radius-802.1x


              191
              
 univention-install -y --assume-yes ucs-school-radius-802.1x

            

        

          192
          
 . utils.sh; run_join_scripts

          192
          
 . utils.sh; run_join_scripts

        

        

          193
          
command8:

          193
          
command8:

        

        

          194
          
 # Wait for possible postruns from the run_join_scripts command

          194
          
 # Wait for possible postruns from the run_join_scripts command

        



(-)a/test/scenarios/autotest-206-ucsschool-update-singleserver-s4.cfg
      (-2 / +2 lines)




  

    

    

       Lines 54-61
      command2: 
    
  Link Here 
    

  

        

          54
          
 . utils.sh; install_apps ucsschool

          54
          
 . utils.sh; install_apps ucsschool

        

        

          55
          
 . utils.sh; run_join_scripts

          55
          
 . utils.sh; run_join_scripts

        

        

          56
          
 . utils.sh; prevent_ucstest_on_fail python2.7 /root/schoolinstaller.py -uAdministrator -p univention -o School1 -S -s 4

          56
          
 . utils.sh; prevent_ucstest_on_fail python2.7 /root/schoolinstaller.py -uAdministrator -p univention -o School1 -S -s 4

        

          
            

              57
              
 univention-install -y --force-yes ucs-school-roleshares


              57
              
 univention-install -y --assume-yes ucs-school-roleshares

            

            

              58
              
 univention-install -y --force-yes ucs-school-radius-802.1x


              58
              
 univention-install -y --assume-yes ucs-school-radius-802.1x

            

        

          59
          
 . utils.sh; run_join_scripts

          59
          
 . utils.sh; run_join_scripts

        

        

          60
          
 . utils.sh; TARGET_VERSION="[ENV:OLD_VERSION]" RELEASE_UPDATE=public jenkins_updates

          60
          
 . utils.sh; TARGET_VERSION="[ENV:OLD_VERSION]" RELEASE_UPDATE=public jenkins_updates

        

        

          61
          
command3:

          61
          
command3:

        



(-)a/test/scenarios/autotest-208-ucsschool-update-multiserver-s4.cfg
      (-2 / +2 lines)




  

    

    

       Lines 176-183
      command2: 
    
  Link Here 
    

  

        

          176
          
 . utils.sh; set_administrator_dn_for_ucs_test; set_administrator_password_for_ucs_test univention

          176
          
 . utils.sh; set_administrator_dn_for_ucs_test; set_administrator_password_for_ucs_test univention

        

        

          177
          
 ASYNC . utils.sh; TARGET_VERSION="[ENV:OLD_VERSION]" RELEASE_UPDATE=public jenkins_updates

          177
          
 ASYNC . utils.sh; TARGET_VERSION="[ENV:OLD_VERSION]" RELEASE_UPDATE=public jenkins_updates

        

        

          178
          
command3:

          178
          
command3:

        

          
            

              179
              
 univention-install -y --force-yes ucs-school-radius-802.1x


              179
              
 univention-install -y --assume-yes ucs-school-radius-802.1x

            

            

              180
              
 univention-install -y --force-yes ucs-school-roleshares


              180
              
 univention-install -y --assume-yes ucs-school-roleshares

            

        

          181
          
 # update from old ucs version to new ucs version, use school devel scope if specified in UCSSCHOOL_RELEASE

          181
          
 # update from old ucs version to new ucs version, use school devel scope if specified in UCSSCHOOL_RELEASE

        

        

          182
          
 . utils.sh; run_join_scripts

          182
          
 . utils.sh; run_join_scripts

        

        

          183
          
 . utils.sh; activate_ucsschool_repositories

          183
          
 . utils.sh; activate_ucsschool_repositories

        



(-)a/test/utils/base_appliance.sh
      (-11 / +10 lines)




  

    

    

       Lines 43-55
      check_returnvalue () 
    
  Link Here 
    

  

        

          43
          

          43
          

        

        

          44
          
install_vmware_packages ()

          44
          
install_vmware_packages ()

        

        

          45
          
{

          45
          
{

        

          
            

              46
              
	univention-install -y --force-yes open-vm-tools


              46
              
	univention-install -y --assume-yes open-vm-tools

            

        

          47
          
}

          47
          
}

        

        

          48
          

          48
          

        

        

          49
          
install_virtualbox_packages ()

          49
          
install_virtualbox_packages ()

        

        

          50
          
{

          50
          
{

        

        

          51
          
	ucr set repository/online/unmaintained="yes"

          51
          
	ucr set repository/online/unmaintained="yes"

        

          
            

              52
              
	univention-install -y --force-yes virtualbox-guest-x11


              52
              
	univention-install -y --assume-yes virtualbox-guest-x11

            

        

          53
          
	ucr set repository/online/unmaintained="no"

          53
          
	ucr set repository/online/unmaintained="no"

        

        

          54
          
}

          54
          
}

        

        

          55
          

          55
          

        

  

    

    

       Lines 57-63
      install_activation_packages () 
    
  Link Here 
    

  

        

          57
          
{

          57
          
{

        

        

          58
          
	if "$1"

          58
          
	if "$1"

        

        

          59
          
	then

          59
          
	then

        

          
            

              60
              
		univention-install -y --force-yes univention-system-activation


              60
              
		univention-install -y --assume-yes univention-system-activation

            

        

          61
          
		ucr set --force auth/sshd/user/root=yes

          61
          
		ucr set --force auth/sshd/user/root=yes

        

        

          62
          
		ucr set appliance/activation/enabled=true

          62
          
		ucr set appliance/activation/enabled=true

        

        

          63
          
	else

          63
          
	else

        

  

    

    

       Lines 270-276
      if [ "$close_fds" = "TRUE" ]; then 
    
  Link Here 
    

  

        

          270
          
	exec 1> /dev/null

          270
          
	exec 1> /dev/null

        

        

          271
          
	exec 2> /dev/null

          271
          
	exec 2> /dev/null

        

        

          272
          
fi

          272
          
fi

        

          
            

              273
              
\$update_commands_install -y --force-yes -o="APT::Get::AllowUnauthenticated=1;" $packages || die


              273
              
\$update_commands_install -y --assume-yes -o="APT::Get::AllowUnauthenticated=1;" $packages || die

            

        

          274
          
univention-app register --do-it ${ucsversion}/${app}=${version}

          274
          
univention-app register --do-it ${ucsversion}/${app}=${version}

        

        

          275
          

          275
          

        

        

          276
          
uid="\$(custom_username Administrator)"

          276
          
uid="\$(custom_username Administrator)"

        

  

    

    

       Lines 687-694
      uninstall_packages () 
    
  Link Here 
    

  

        

          687
          
	# if upgraded, u-basesystem will be installed by postup.sh

          687
          
	# if upgraded, u-basesystem will be installed by postup.sh

        

        

          688
          
	state="$(dpkg --get-selections univention-basesystem 2>/dev/null | awk '{print $2}')"

          688
          
	state="$(dpkg --get-selections univention-basesystem 2>/dev/null | awk '{print $2}')"

        

        

          689
          
	if [ "$state" = "install" ]; then

          689
          
	if [ "$state" = "install" ]; then

        

          
            

              690
              
		apt-get purge -y --force-yes univention-basesystem


              690
              
		apt-get purge -y --assume-yes univention-basesystem

            

            

              691
              
		apt-get -y --force-yes autoremove


              691
              
		apt-get -y --assume-yes autoremove

            

        

          692
          
	fi

          692
          
	fi

        

        

          693
          

          693
          

        

        

          694
          
	univention-prune-kernels -v

          694
          
	univention-prune-kernels -v

        

  

    

    

       Lines 740-746
      __EOF__ 
    
  Link Here 
    

  

        

          740
          
	/usr/lib/univention-system-setup/scripts/setup-join.sh 2>&1 | tee /var/log/univention/setup.log

          740
          
	/usr/lib/univention-system-setup/scripts/setup-join.sh 2>&1 | tee /var/log/univention/setup.log

        

        

          741
          
	echo "root:univention" | chpasswd

          741
          
	echo "root:univention" | chpasswd

        

        

          742
          
	# We still need u-s-s-boot, so reinstall it

          742
          
	# We still need u-s-s-boot, so reinstall it

        

          
            

              743
              
	univention-install -y --force-yes --reinstall univention-system-setup-boot


              743
              
	univention-install -y --assume-yes --reinstall univention-system-setup-boot

            

        

          744
          

          744
          

        

        

          745
          
	register_app_components "$main_app"

          745
          
	register_app_components "$main_app"

        

        

          746
          

          746
          

        

  

    

    

       Lines 755-761
      __EOF__ 
    
  Link Here 
    

  

        

          755
          
			packages="$(get_app_attr "${app}" DefaultPackages) $(get_app_attr "${app}" DefaultPackagesMaster)"

          755
          
			packages="$(get_app_attr "${app}" DefaultPackages) $(get_app_attr "${app}" DefaultPackagesMaster)"

        

        

          756
          
			if [ -n "$packages" ]; then

          756
          
			if [ -n "$packages" ]; then

        

        

          757
          
				# shellcheck disable=SC2154,SC2086

          757
          
				# shellcheck disable=SC2154,SC2086

        

          
            

              758
              
				$update_commands_install -y --force-yes -o="APT::Get::AllowUnauthenticated=1;" $packages


              758
              
				$update_commands_install -y --assume-yes -o="APT::Get::AllowUnauthenticated=1;" $packages

            

        

          759
          
			fi

          759
          
			fi

        

        

          760
          
			univention-run-join-scripts

          760
          
			univention-run-join-scripts

        

        

          761
          
		fi

          761
          
		fi

        

  

    

    

       Lines 794-800
      setup_appliance () 
    
  Link Here 
    

  

        

          794
          

          794
          

        

        

          795
          
	uninstall_packages

          795
          
	uninstall_packages

        

        

          796
          

          796
          

        

          
            

              797
              
	univention-install -y --force-yes --reinstall univention-system-setup-boot


              797
              
	univention-install -y --assume-yes --reinstall univention-system-setup-boot

            

        

          798
          

          798
          

        

        

          799
          
	# shrink appliance image size

          799
          
	# shrink appliance image size

        

        

          800
          
	rm -f /etc/apt/sources.list.d/05univention-system-setup.list

          800
          
	rm -f /etc/apt/sources.list.d/05univention-system-setup.list

        

  

    

    

       Lines 1116-1122
      install_appreport () 
    
  Link Here 
    

  

        

          1116
          
		repository/online/component/appreport/version="4.0"

          1116
          
		repository/online/component/appreport/version="4.0"

        

        

          1117
          
	cat >/usr/lib/univention-system-setup/appliance-hooks.d/install-appreport <<__EOF__

          1117
          
	cat >/usr/lib/univention-system-setup/appliance-hooks.d/install-appreport <<__EOF__

        

        

          1118
          
#!/bin/sh

          1118
          
#!/bin/sh

        

          
            

              1119
              
univention-install -y --force-yes univention-appreport


              1119
              
univention-install -y --assume-yes univention-appreport

            

        

          1120
          
__EOF__

          1120
          
__EOF__

        

        

          1121
          
	chmod +x /usr/lib/univention-system-setup/appliance-hooks.d/install-appreport

          1121
          
	chmod +x /usr/lib/univention-system-setup/appliance-hooks.d/install-appreport

        

        

          1122
          
}

          1122
          
}

        

            

              1123
              
- 

              
              
            






  

  Return to bug 48891