diff --git a/debian/control b/debian/control index f58cb13e..c4088164 100644 --- a/debian/control +++ b/debian/control @@ -17,29 +17,6 @@ Vcs-Browser: https://github.com/CanonicalLtd/subiquity Vcs-Git: https://github.com/CanonicalLtd/subiquity.git XS-Ubuntu-Use-Langpack: yes -Package: subiquity -Architecture: all -Depends: curtin, - iso-codes, - python3, - subiquitycore, - probert-storage, - ${misc:Depends}, - ${python3:Depends} -Description: Ubuntu Server Installer - SUbiquity is an installer system for servers, embedded devices and desktops - or laptops meant to build systems as quickly as possible for users to reach - a point where their system is usable. - . - By default, subiquity provides a "first boot" experience that allows users - to do initial system configuration such as adding users and login settings, - along with doing basic network configuration. It can also be used to build - a new system from the ground up, partitioning and copying a disk image to - the storage device selected by the user. - . - This package provides the installer routines for bootstrapping a system - with the Subiquity the server installer UI. - Package: subiquitycore Architecture: all Depends: probert-network, @@ -78,47 +55,3 @@ Description: Ubuntu Core Pre-Ownership Configurator . This package provides the setup routines for pre-ownership configuration of a system. - -Package: subiquity-tools -Architecture: all -Depends: cloud-image-utils, - devscripts, - extlinux, - gdisk, - git, - grub-efi-amd64-signed, - grub2-common, - kpartx, - parted, - pep8, - pyflakes, - python-all, - python-mock, - python-nose, - python-oauthlib, - python-yaml, - python3-mock, - python3-nose, - python3-setuptools, - qemu-utils, - shim, - shim-signed, - simplestreams, - subiquity, - syslinux-common, - ubuntu-cloudimage-keyring, - ${misc:Depends}, - ${python3:Depends} -Description: Ubuntu Server Installer - SUbiquity is an installer system for servers, embedded devices and desktops - or laptops meant to build systems as quickly as possible for users to reach - a point where their system is usable. - . - By default, subiquity provides a "first boot" experience that allows users - to do initial system configuration such as adding users and login settings, - along with doing basic network configuration. It can also be used to build - a new system from the ground up, partitioning and copying a disk image to - the storage device selected by the user. - . - This package provides the installer which all the necessary utilities to - complete a new installation. diff --git a/debian/rules b/debian/rules index 5f386ccd..4f18d92f 100755 --- a/debian/rules +++ b/debian/rules @@ -30,16 +30,6 @@ override_dh_installinit: install -m 0644 $(CURDIR)/debian/console-conf.conf $(CURDIR)/debian/console-conf/lib/systemd/system/getty@.service.d/ mkdir $(CURDIR)/debian/console-conf/lib/systemd/system/serial-getty@.service.d/ install -m 0644 $(CURDIR)/debian/console-conf-serial.conf $(CURDIR)/debian/console-conf/lib/systemd/system/serial-getty@.service.d/ - dh_installsystemd --no-start --name=subiquity - dh_installsystemd --no-start --name=serial-subiquity@ - dh_installsystemd --no-start --name=subiquity-debug@ - mkdir $(CURDIR)/debian/subiquity/lib/systemd/system/getty@tty1.service.d/ - install -m 0644 $(CURDIR)/debian/subiquity-tty1.conf $(CURDIR)/debian/subiquity/lib/systemd/system/getty@tty1.service.d/ - mkdir $(CURDIR)/debian/subiquity/lib/systemd/system/getty@.service.d/ - install -m 0644 $(CURDIR)/debian/subiquity-ttyN.conf $(CURDIR)/debian/subiquity/lib/systemd/system/getty@.service.d/ - ln -s /dev/null $(CURDIR)/debian/subiquity/lib/systemd/system/subiquity-debug@tty1.service - mkdir $(CURDIR)/debian/subiquity/lib/systemd/system/serial-getty@.service.d/ - install -m 0644 $(CURDIR)/debian/subiquity-serial.conf $(CURDIR)/debian/subiquity/lib/systemd/system/serial-getty@.service.d/ override_dh_auto_test: @echo "No tests." diff --git a/debian/subiquity-serial.conf b/debian/subiquity-serial.conf deleted file mode 100644 index 9aef8ee3..00000000 --- a/debian/subiquity-serial.conf +++ /dev/null @@ -1,2 +0,0 @@ -[Service] -ExecStartPre=/bin/systemctl start serial-subiquity@%i.service diff --git a/debian/subiquity-tools.links b/debian/subiquity-tools.links deleted file mode 100644 index c0ca7997..00000000 --- a/debian/subiquity-tools.links +++ /dev/null @@ -1,2 +0,0 @@ -/usr/share/subiquity/installer/geninstaller /usr/bin/subiquity-geninstaller -/usr/share/subiquity/installer/runinstaller /usr/bin/subiquity-runinstaller diff --git a/debian/subiquity-tty1.conf b/debian/subiquity-tty1.conf deleted file mode 100644 index b846fd8b..00000000 --- a/debian/subiquity-tty1.conf +++ /dev/null @@ -1,2 +0,0 @@ -[Service] -ExecStartPre=/bin/systemctl start subiquity.service diff --git a/debian/subiquity-ttyN.conf b/debian/subiquity-ttyN.conf deleted file mode 100644 index 6f23a730..00000000 --- a/debian/subiquity-ttyN.conf +++ /dev/null @@ -1,2 +0,0 @@ -[Service] -ExecStartPre=/bin/systemctl start subiquity-debug@%i.service diff --git a/debian/subiquity.install b/debian/subiquity.install deleted file mode 100644 index c8de89c6..00000000 --- a/debian/subiquity.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/usr/bin/subiquity-* usr/share/subiquity -usr/share/subiquity/subiquity diff --git a/debian/subiquity.links b/debian/subiquity.links deleted file mode 100644 index 2e8db79b..00000000 --- a/debian/subiquity.links +++ /dev/null @@ -1 +0,0 @@ -/usr/share/subiquity/subiquity-tui /usr/bin/subiquity diff --git a/debian/subiquity.serial-subiquity@.service b/debian/subiquity.serial-subiquity@.service deleted file mode 100644 index fdd8b474..00000000 --- a/debian/subiquity.serial-subiquity@.service +++ /dev/null @@ -1,30 +0,0 @@ -[Unit] -Description=Subiquity, the installer for Ubuntu Server %I -BindsTo=dev-%i.device -After=dev-%i.device systemd-user-sessions.service plymouth-quit-wait.service -After=rc-local.service -ConditionPathExists=!/run/subiquity/complete -StartLimitInterval=0 - -[Service] -Environment=PYTHONPATH=/usr/share/subiquity -ExecStartPre=/bin/systemctl stop serial-getty@%I -ExecStart=/sbin/agetty -i -n --keep-baud -l /usr/share/subiquity/subiquity-tui --login-options "--serial" 115200,38400,9600 %I $TERM -ExecStopPost=/bin/systemctl start serial-getty@%I -Type=idle -Restart=always -RestartSec=0 -UtmpIdentifier=%I -TTYPath=/dev/%I -TTYReset=yes -TTYVHangup=yes -KillMode=process -IgnoreSIGPIPE=no -SendSIGHUP=yes - -#TTYVTDisallocate=yes -#KillMode=process -#Restart=always -#StandardInput=tty-force -#StandardOutput=tty -#StandardError=tty diff --git a/debian/subiquity.subiquity-debug@.service b/debian/subiquity.subiquity-debug@.service deleted file mode 100644 index e6994363..00000000 --- a/debian/subiquity.subiquity-debug@.service +++ /dev/null @@ -1,30 +0,0 @@ -[Unit] -Description=Subiquity debug shell %I -After=systemd-user-sessions.service plymouth-quit-wait.service -After=rc-local.service -IgnoreOnIsolate=yes -ConditionPathExists=/dev/tty0 -ConditionPathExists=!/run/subiquity/complete - -[Service] -Environment=PYTHONPATH=/usr/share/subiquity -ExecStartPre=/bin/systemctl stop getty@%I -ExecStart=/sbin/agetty -i -n --noclear -l /usr/share/subiquity/subiquity-debug %I $TERM -ExecStopPost=/bin/systemctl start getty@%I -Type=idle -Restart=always -RestartSec=0 -UtmpIdentifier=%I -TTYPath=/dev/%I -TTYReset=yes -TTYVHangup=yes -TTYVTDisallocate=yes -KillMode=process -IgnoreSIGPIPE=no -SendSIGHUP=yes - -#KillMode=process -#Restart=always -#StandardInput=tty-force -#StandardOutput=tty -#StandardError=tty diff --git a/debian/subiquity.subiquity.service b/debian/subiquity.subiquity.service deleted file mode 100644 index c2bf11b0..00000000 --- a/debian/subiquity.subiquity.service +++ /dev/null @@ -1,31 +0,0 @@ -[Unit] -Description=Subiquity, the installer for Ubuntu Server -After=systemd-user-sessions.service plymouth-quit-wait.service -After=rc-local.service -IgnoreOnIsolate=yes -ConditionPathExists=/dev/tty0 -ConditionPathExists=!/run/subiquity/complete - -[Service] -Environment=PYTHONPATH=/usr/share/subiquity -ExecStartPre=/usr/share/subiquity/subiquity-loadkeys -ExecStartPre=/bin/systemctl stop getty@tty1 -ExecStart=/sbin/agetty -i -n --noclear -l /usr/share/subiquity/subiquity-tui tty1 $TERM -ExecStopPost=/bin/systemctl start getty@tty1 -Type=idle -Restart=always -RestartSec=0 -UtmpIdentifier=tty1 -TTYPath=/dev/tty1 -TTYReset=yes -TTYVHangup=yes -TTYVTDisallocate=yes -KillMode=process -IgnoreSIGPIPE=no -SendSIGHUP=yes - -#KillMode=process -#Restart=always -#StandardInput=tty-force -#StandardOutput=tty -#StandardError=tty