From 5dfabe44361a04c2bcbdc53bbe520bb9ebaaaf47 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 7 Jun 2010 13:11:13 +0200 Subject: [PATCH] Removing getty and login wrappers, live-config takes care about that now. --- Makefile | 4 ++-- bin/live-getty | 20 -------------------- bin/live-login | 12 ------------ 3 files changed, 2 insertions(+), 34 deletions(-) delete mode 100755 bin/live-getty delete mode 100755 bin/live-login diff --git a/Makefile b/Makefile index 85b8909..efdb0e3 100644 --- a/Makefile +++ b/Makefile @@ -45,7 +45,7 @@ install: # Installing executables mkdir -p $(DESTDIR)/sbin - cp bin/live-getty bin/live-login bin/live-new-uuid bin/live-snapshot bin/live-swapfile $(DESTDIR)/sbin + cp bin/live-new-uuid bin/live-snapshot bin/live-swapfile $(DESTDIR)/sbin mkdir -p $(DESTDIR)/usr/share/live-boot cp bin/live-preseed bin/live-reconfigure contrib/languagelist $(DESTDIR)/usr/share/live-boot @@ -79,7 +79,7 @@ install: uninstall: # Uninstalling executables - rm -f $(DESTDIR)/sbin/live-getty $(DESTDIR)/sbin/live-login $(DESTDIR)/sbin/live-snapshot $(DESTDIR)/sbin/live-swapfile + rm -f $(DESTDIR)/sbin/live-snapshot $(DESTDIR)/sbin/live-swapfile rm -rf $(DESTDIR)/usr/share/live-boot rm -f $(DESTDIR)/usr/share/initramfs-tools/hooks/live rm -rf $(DESTDIR)/usr/share/initramfs-tools/scripts/live* diff --git a/bin/live-getty b/bin/live-getty deleted file mode 100755 index 6781ea5..0000000 --- a/bin/live-getty +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -set -e - -AUTOLOGIN="1" - -for ARGUMENT in "${@}" -do - if [ "${ARGUMENT}" = "-l" ] || [ "${ARGUMENT}" = "-n" ] - then - AUTOLOGIN="0" - fi -done - -if [ "${AUTOLOGIN}" = "1" ] -then - exec /sbin/getty -n -l /sbin/live-login ${*} -else - exec /sbin/getty ${*} -fi diff --git a/bin/live-login b/bin/live-login deleted file mode 100755 index c2cc5a1..0000000 --- a/bin/live-login +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -set -e - -USERNAME="root" - -if [ -f /etc/live.conf ] -then - . /etc/live.conf -fi - -exec /bin/login -f "${USERNAME}" -- 2.11.4.GIT