Skip to content
This repository has been archived by the owner on May 22, 2019. It is now read-only.

Commit

Permalink
It looks like localectl does not work in a chrooted environment. Geez...
Browse files Browse the repository at this point in the history
  • Loading branch information
karasu committed Sep 29, 2016
1 parent 5e62af6 commit e49e60f
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 4 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ This is the latest, officially released version of Cnchi, AKA: **Cnchi Stable**.
|Development Stage|Branch|Version| Code Status|
----------------- | -------------- | -------------- | -------- |
|*Cnchi Legacy*|*0.12.x*|*v0.12.46*|*Frozen*|
|**Cnchi Stable**|**0.14.x**|**v0.14.185**|**Bug Fixes Only**|
|**Cnchi Stable**|**0.14.x**|**v0.14.186**|**Bug Fixes Only**|
|Cnchi Next|master|v0.15.219| Active Development|


Expand Down
2 changes: 1 addition & 1 deletion cnchi/info.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

""" Set some Cnchi global constants """

CNCHI_VERSION = "0.14.185"
CNCHI_VERSION = "0.14.186"
CNCHI_WEBSITE = "http://www.antergos.com"
CNCHI_RELEASE_STAGE = "production"

Expand Down
18 changes: 17 additions & 1 deletion cnchi/installation/install.py
Original file line number Diff line number Diff line change
Expand Up @@ -1021,7 +1021,23 @@ def set_keymap(self):
cmd = ['localectl', 'set-x11-keymap', keyboard_layout]
if keyboard_variant:
cmd.append(keyboard_variant)
chroot_call(cmd)
# Systemd based tools like localectl do not work inside a chroot
# This will set correct keymap to live media, we will copy
# the created files to destination
call(cmd)
# Copy 00-keyboard.conf and vconsole.conf files to destination
path = os.path.join(DEST_DIR, "etc/X11/xorg.conf.d")
os.makedirs(path, mode=0o755, exist_ok=True)
files = [ "/etc/X11/xorg.conf.d/00-keyboard.conf", "/etc/vconsole.conf"]
for src in files:
try:
dst = os.path.join(DEST_DIR, src[1:])
shutil.copy(src, dst)
logging.debug("%s copied.", src)
except FileNotFoundError:
logging.error("File %s not found", src)
except FileExistsError:
logging.warning("File %s already exists.", dst)

def get_zfs_version(self):
""" Get installed zfs version """
Expand Down
2 changes: 1 addition & 1 deletion update.info
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{"version":"0.14.185","files":[
{"version":"0.14.186","files":[
]}

1 comment on commit e49e60f

@karasu
Copy link
Member Author

@karasu karasu commented on e49e60f Sep 29, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, it seems this way is working 👍

Please sign in to comment.