From 0b5f424fd4e1650ba22a9667b1d88e01df4ac277 Mon Sep 17 00:00:00 2001
From: Rohan Garg <rohan@garg.io>
Date: Thu, 17 Mar 2016 14:23:27 +0100
Subject: [PATCH] We don't use krfbcfg anymore

---
 debian/calamares-post.install            |  1 -
 debian/extra_modules/krfbcfg/main.py     | 43 ------------------------
 debian/extra_modules/krfbcfg/module.desc |  6 ----
 debian/settings.conf                     |  1 -
 4 files changed, 51 deletions(-)
 delete mode 100644 debian/extra_modules/krfbcfg/main.py
 delete mode 100644 debian/extra_modules/krfbcfg/module.desc

diff --git a/debian/calamares-post.install b/debian/calamares-post.install
index c95f912..f793532 100644
--- a/debian/calamares-post.install
+++ b/debian/calamares-post.install
@@ -2,5 +2,4 @@
 debian/settings.conf /etc/calamares/
 debian/modules/* /etc/calamares/modules/
 usr/*
-debian/extra_modules/* usr/lib/calamares/modules/
 debian/fs_resize usr/sbin/
diff --git a/debian/extra_modules/krfbcfg/main.py b/debian/extra_modules/krfbcfg/main.py
deleted file mode 100644
index 591083c..0000000
--- a/debian/extra_modules/krfbcfg/main.py
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-#
-# === This file is part of Calamares - <http://github.com/calamares> ===
-#
-#   Copyright 2015, Teo Mrnjavac <teo@kde.org>
-#
-#   Calamares is free software: you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation, either version 3 of the License, or
-#   (at your option) any later version.
-#
-#   Calamares is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
-
-import libcalamares
-import os
-from pwd import getpwnam
-
-def run():
-    """ Setup network configuration """
-
-    obfuscatedPassword = libcalamares.globalstorage.value("password")
-    user = libcalamares.globalstorage.value("autologinUser")
-    cfgPath = libcalamares.utils.check_target_env_output(["sudo", "-u", user, "kde4-config", "--path", "config"]).split(":")[0]
-    os.makedirs(cfgPath, exist_ok=True)
-
-    with open(cfgPath + "krfbrc", 'w') as krfbrc:
-        krfbrc.write("[Security]\n" +
-                     "allowUnattendedAccess=true\n" +
-                     "desktopPassword=" + obfuscatedPassword + "\n" +
-                     "noWallet=true\n" +
-                     "unattendedPassword=" + obfuscatedPassword + "\n")
-
-    userEntry = getpwnam(user)
-    libcalamares.utils.check_target_env_output(["chown", "-R", "{0}:{1}".format(userEntry.pw_uid, userEntry.pw_gid), userEntry.pw_dir])
-
-    return None
diff --git a/debian/extra_modules/krfbcfg/module.desc b/debian/extra_modules/krfbcfg/module.desc
deleted file mode 100644
index 63ba372..0000000
--- a/debian/extra_modules/krfbcfg/module.desc
+++ /dev/null
@@ -1,6 +0,0 @@
----
-type:       "job"
-name:       "krfbcfg"
-interface:  "python"
-requires:   []
-script:     "main.py"
diff --git a/debian/settings.conf b/debian/settings.conf
index a42a3ca..a2d5c25 100644
--- a/debian/settings.conf
+++ b/debian/settings.conf
@@ -27,7 +27,6 @@ sequence:
       - networkcfg
       - services
       - displaymanager
-      - krfbcfg
   - show:
       - finished