summaryrefslogtreecommitdiff
path: root/install
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2013-09-15 15:10:24 +0400
committerIgor Pashev <pashev.igor@gmail.com>2013-09-15 15:10:24 +0400
commit1f496a70f5c87da4fdecfe2df80b06711a3f3f5c (patch)
tree4aef0791d25db32ebe9a1ff197c02ebf7217284c /install
parent964c67df640c1cee9b742aa1a6f9bd4d8d7ab2f1 (diff)
downloadlive-1f496a70f5c87da4fdecfe2df80b06711a3f3f5c.tar.gz
Minor fixes before release :-)
Diffstat (limited to 'install')
-rwxr-xr-xinstall12
1 files changed, 8 insertions, 4 deletions
diff --git a/install b/install
index 0ab6d2f..b812d01 100755
--- a/install
+++ b/install
@@ -91,14 +91,17 @@ profiles = [
'name': 'Basic',
'desc' : 'Basic system without X',
# Some packages may be absent, they will be skipped:
- 'packages' : '''locales vim bash-completion mc sudo lynx mutt wget curl openssh-server''',
+ 'packages' : '''locales vim bash-completion mc sudo lynx
+ mutt wget curl openssh-server
+ '''.split(),
},
{
'name': 'Desktop',
'desc' : 'Install X, XFCE and some graphical applications',
'packages' : '''mc locales bash-completion vim-gtk synaptic abiword dillo gnumeric
sylpheed geany lightdm pidgin evince sudo gimp midori stardict mirage
- xorg xfce4 xfce4-terminal dbus curl wget transmission-gtk xarchiver''',
+ xorg xfce4 xfce4-terminal dbus curl wget transmission-gtk xarchiver
+ '''.split(),
},
]
@@ -821,7 +824,7 @@ def apt_get_install(log):
packages = [pkg for pkg in profiles[profile]["packages"] if pkg in apt_cache]
missed = [pkg for pkg in profiles[profile]["packages"] if not pkg in apt_cache]
for p in missed:
- os.write(log, "WARNING: missing package `{}'".format(p))
+ os.write(log, "WARNING: missing package `{}'\n".format(p))
read, write = os.pipe()
pid = os.fork()
@@ -1056,7 +1059,8 @@ def create_user():
ButtonChoiceWindow(screen, title='Error',
text='User login name cannot be empty.', buttons=['Ok'])
continue
- adduser = ['adduser', '--shell', '/usr/bin/bash', '--add_extra_groups', '--disabled-login']
+ # polkit checks if shell is in /etc/shells, /usr/bin/bash is not, thus /bin/bash
+ adduser = ['adduser', '--shell', '/bin/bash', '--add_extra_groups', '--disabled-login']
if userid.value():
if userid.value().isdigit():
adduser += ['--uid', userid.value()]