Skip to content

Commit

Permalink
fix the bug I caused 😬 Antergos#347
Browse files Browse the repository at this point in the history
  • Loading branch information
lots0logs committed May 20, 2015
1 parent 28de3d2 commit 9e2324a
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[2015-05-19 21:15:51 -0500] fix kde config issue reported in forum Dustin Falgout {28de3d2}
[2015-05-19 20:05:17 -0500] start vbox client services for vbox installs Dustin Falgout {7500cd4}
[2015-05-19 10:28:50 +0200] Merge pull request #343 from Wyn10/patch-2 karasu {b2e93e5}
[2015-05-19 03:41:58 -0400] Update postinstall.sh Wyn {9c1a527}
Expand Down
2 changes: 1 addition & 1 deletion cnchi/info.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

""" Set some Cnchi global constants """

CNCHI_VERSION = "0.8.136"
CNCHI_VERSION = "0.8.137"
CNCHI_WEBSITE = "http://www.antergos.com"

if __name__ == '__main__':
Expand Down
6 changes: 3 additions & 3 deletions cnchi/installation/process.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ def __init__(self, settings, callback_queue, mount_devices,
self.auto_device = ""
self.packages = []
self.pacman = None
self.vbox = False
self.vbox = "False"

def queue_fatal_event(self, txt):
""" Queues the fatal event and exits process """
Expand Down Expand Up @@ -598,7 +598,7 @@ def select_packages(self):
txt = " ".join(hardware_pkgs)
logging.debug(_("Hardware module added these packages : %s"), txt)
if 'virtualbox-guest-utils' in hardware_pkgs:
self.vbox = True
self.vbox = "True"
# By default, hardware module adds modesetting driver
# but in a 'base' install we don't want it
if self.desktop == "base" and "xf86-video-modesetting" in hardware_pkgs:
Expand Down Expand Up @@ -1307,7 +1307,7 @@ def configure_system(self):

default_groups = 'lp,video,network,storage,wheel,audio'

if self.vbox:
if self.vbox == "True":
# Why there is no vboxusers group? Add it ourselves.
chroot_run(['groupadd', 'vboxusers'])
default_groups += ',vboxusers,vboxsf'
Expand Down
2 changes: 1 addition & 1 deletion scripts/postinstall.sh
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@ postinstall()
chroot ${DESTDIR} chown -R ${USER_NAME}:users /home/${USER_NAME}

# Start vbox client services if we are installed in vbox
if [[ $IS_VBOX ]] || [[ $IS_VBOX = 0 ]] || [[ $IS_VBOX = true ]]; then
if [[ $IS_VBOX ]] || [[ $IS_VBOX = 0 ]] || [[ $IS_VBOX = "True" ]]; then
sed -i 's|echo "X|/usr/bin/VBoxClient-all \&\necho "X|g' ${DESTDIR}/etc/lightdm/Xsession
fi

Expand Down

0 comments on commit 9e2324a

Please sign in to comment.