shadeslayer

diff --git a/src/modules/users/SetPasswordJob.cpp b/src/modules/users/SetPasswordJob.cpp
index 5631ded..5ec86ed 100644
--- a/src/modules/users/SetPasswordJob.cpp
+++ b/src/modules/users/SetPasswordJob.cpp
@@ -59,7 +59,7 @@ SetPasswordJob::exec()
         return Calamares::JobResult::error( tr( "Bad destination system path." ),
                                             tr( "rootMountPoint is %1" ).arg( destDir.absolutePath() ) );
 
-    QByteArray data = crypt( m_newPassword.toLatin1(), QString( "$6$%1$" ).arg( m_userName ).toLatin1() );
+    QByteArray data = crypt( m_newPassword.toLatin1(), QString( "\$6\$%1\$" ).arg( m_userName ).toLatin1() );

shadeslayer

/* === This file is part of Calamares - <http://github.com/calamares> ===
 *
 *   Copyright 2014-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,

shadeslayer

find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED WebKit WebKitWidgets )

include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui
                     ${QT_QTWEBKIT_INCLUDE_DIR} )

set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
                       ${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules )


calamares_add_plugin( webview

shadeslayer

#!/usr/bin/env python3
# -*- coding: utf-8 -*-
#
# === This file is part of Calamares - <http://github.com/calamares> ===
#
#   Copyright 2015, Rohan Garg <rohan@garg.io>
#
#   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

shadeslayer

#!/usr/bin/env python3
# -*- coding: utf-8 -*-
#
# === This file is part of Calamares - <http://github.com/calamares> ===
#
#   Copyright 2015, Rohan Garg <rohan@garg.io>
#
#   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

shadeslayer

Mounted /dev/loop6p1 on /tmp/d20150813-16972-px628t
Mounted /dev/loop6p2 on /tmp/d20150813-16972-1d8wncr
Downloading firmware.tar.gz
Unmounting /dev/loop6p2
Unmounting /dev/loop6p1
umount: /tmp/d20150813-16972-1d8wncr: not mounted

shadeslayer

    Mount.mount(@btldrmntpt) do |boot_dir|
      Mount.mount(@rootfsmntpt) do |rootfs_dir|
        r = Firmware.new(@c)
        t[:boot] = boot_dir
        t[:modules] = "#{rootfs_dir}/lib/modules/"
        r.install(t)
      end
    end

shadeslayer

require 'tmpdir'

class Mount
  def self.mount(path)
    @mntdir = Dir.mktmpdir
    fail 'Mounting boot partition failed!' unless system('sudo',
                                                         'mount',
                                                         path,
                                                         @mntdir)
    puts "Mounted #{path} on #{@mntdir}"

shadeslayer

require 'tmpdir'

class Mount
  def initialize
    @mntdir = Dir.mktmpdir
  end

  def mount(path)
    fail 'Mounting boot partition failed!' unless system('sudo',
                                                         'mount',

shadeslayer

Package: *kwin*
Pin: origin "http://pangea-data.s3.amazonaws.com/dci/odroid/debian/"
Pin-Priority: 700